Fix CacheProvider