More cleanup in CacheView