Fix missing ProviderCacher.
Merge branch 'missing-provider-cacher'

* missing-provider-cacher:
  Fix missing ProviderCacher.