Added CacheManager (not working)