This change lays the groundwork for canceling in-flight requests.
Without it, we always wait for a request to complete, even when we
already know its result won't be used.

Release Notes:

- N/A