Small changes in CacheManager's API