return back cache as public prop in query

Author: KSDaemon

packages/cubejs-api-gateway/src/gateway.ts

@@ -592,17 +592,18 @@ class ApiGateway {
   private normalizeQueryCacheMode(query: Query, cacheMode: CacheMode | undefined): Query {
     if (cacheMode !== undefined) {
       query.cacheMode = cacheMode;
-    } else if (!query.cacheMode && query?.renewQuery !== undefined) {
+    } else if (!query.cache && query?.renewQuery !== undefined) {
       // TODO: Drop this when renewQuery will be removed
       query.cacheMode = query.renewQuery === true
         ? 'must-revalidate'
         : 'stale-if-slow';
-    } else if (!query.cacheMode) {
+    } else if (!query.cache) {
       query.cacheMode = 'stale-if-slow';
     }
 
     // TODO: Drop this when renewQuery will be removed
     query.renewQuery = undefined;
+    query.cache = undefined;
 
     return query;
   }

packages/cubejs-api-gateway/src/query.js

@@ -190,6 +190,7 @@ const querySchema = Joi.object().keys({
   // @deprecated
   renewQuery: Joi.boolean(),
   cacheMode: Joi.valid('stale-if-slow', 'stale-while-revalidate', 'must-revalidate', 'no-cache'),
+  cache: Joi.valid('stale-if-slow', 'stale-while-revalidate', 'must-revalidate', 'no-cache'),
   ungrouped: Joi.boolean(),
   responseFormat: Joi.valid('default', 'compact'),
   subqueryJoins: Joi.array().items(subqueryJoin),

packages/cubejs-api-gateway/src/types/query.ts

@@ -142,7 +142,8 @@ interface Query {
   timezone?: string;
   // @deprecated
   renewQuery?: boolean;
-  cacheMode?: CacheMode;
+  cacheMode?: CacheMode; // used after query normalization
+  cache?: CacheMode; // Used in public interface
   ungrouped?: boolean;
   responseFormat?: ResultType;