Rebuild to cache per-client copy of the connection to prevent constant reauthentication