Handlers now have access to the client.