Yes... basically `setClient` or pass the client to the constructor. It doesn't make things easier to use, but it's clean DI