CacheManager refactoring : the class is not static anymore + TU