Same thing here about caching the client and being able to make sure that it's cleaned up properly when the system shuts down.