Also eliminate all 'cache definition' language in favor of 'cache operation' in comments, method and parameter names (most classes had already been refactored to this effect).