Merge pull request #6612 from MrPetovan/bug/6605-cache-config-adapter-connection