Reworked async query handler to support cancellation invisibly