Add query context persistence to CubeGrillDriver