move back some functionality from cache into conn