Only return stream id when the response gets to the right caller

WIP.