Revert "Fix #8518 (sync requests being cached wrongly on timeout) (#9358)"

This reverts commit f5c93fc9.

This is being backed out due to a regression (#9507) and additional
review feedback being provided.