Fix the cache validation queries

The ETag and S3 cache pieces were still using queries based on the old Response structure.

/cc @hampelm