Add CacheProvider and CacheHolder