Improve how QueryCaches and QueryStates are stored#152835

nnethercote wants to merge 4 commits intorust-lang:mainrust-lang/rust:mainfrom

nnethercote:fix-query-state-query-cachennethercote/rust:fix-query-state-query-cacheCopy head branch name to clipboard