Fix CacheBuilder to use only Cache Provider