The logic to support conditional requests has grown over time, and could be made more efficient and better encapsulated. This would also make fixing issues easier, the concern raised in #33370.
Comment From: rstoyanchev
Fixed by bb17ad8314b81850a939fd265fb53b3361705e85
Comment From: rstoyanchev
See also #33385 for further plans towards 6.2.