Fix for connection caching