Manually merged query cache fixes from 97c02faf0a39dd189eeda4f75fb35bc5db69d541.
Attach a file by drag & drop or click to upload
