Moving CacheManager to separate repository