remove configuration remnants for caching we no longer support
Merge branch 'remove-cache-remnants'