Ensure the connection is cleaned up on non open sessions too