Started cleaning up CacheViewController