Where are we doing the query cache right now? This PR doesn't reference that code removed...