Change CacheFactory interface