Back to how the branch was before plus an idea: stash a reference to the client in the result to hint the GC.