Edited CacheController