Use new buffered client implementation