Fixed connection handling which cached results