Add buffering to client serializers