Update to the new caching version of the query engine