We reset the handler to null after the client execution and there is no back reference, so there shouldn't be a leak. I didn't change the code to reduce the testing impact