Added connection caching