Modified: Improved parameter replacement in CacheKey class.
Merge branches 'master' and 'test.cacheKey'