Allow config caching.
Merge branch 'config-cache'