Reduce overhead for storing the key twice, and more overhead while looking up the connection to remove it after a failure.
