Reverted CacheManager, moved new work to feature branch