Fix CacheBase