Clean up tabs and erroneous magic reference in Cache\CacheManager