wrap the streaming handler as well