diff --git a/packages/cubejs-api-gateway/src/gateway.ts b/packages/cubejs-api-gateway/src/gateway.ts
index 42e3cdb948c72..d8bc4a96f28be 100644
--- a/packages/cubejs-api-gateway/src/gateway.ts
+++ b/packages/cubejs-api-gateway/src/gateway.ts
@@ -1290,7 +1290,7 @@ class ApiGateway {
             rewrittenQuery = this.evalMemberExpressionsInQuery(rewrittenQuery);
           }
 
-          return normalizeQuery(rewrittenQuery, persistent);
+          return normalizeQuery(rewrittenQuery, persistent, cacheMode);
         }
       )
     );
diff --git a/packages/cubejs-api-gateway/src/query.js b/packages/cubejs-api-gateway/src/query.js
index e260d0855d90c..07973571e914b 100644
--- a/packages/cubejs-api-gateway/src/query.js
+++ b/packages/cubejs-api-gateway/src/query.js
@@ -327,7 +327,7 @@ function normalizeQueryCacheMode(query, cacheMode) {
  * @returns {import('./types/query').NormalizedQuery}
  */
 const normalizeQuery = (query, persistent, cacheMode) => {
-  query = normalizeQueryCacheMode(query);
+  query = normalizeQueryCacheMode(query, cacheMode);
   const { error } = querySchema.validate(query);
   if (error) {
     throw new UserError(`Invalid query format: ${error.message || error.toString()}`);
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts b/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts
index 0887aac625065..f5d4e13d61633 100644
--- a/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts
+++ b/packages/cubejs-query-orchestrator/src/orchestrator/QueryCache.ts
@@ -251,17 +251,21 @@ export class QueryCache {
     ) {
       if (queryBody.persistent) {
         // stream will be returned here
-        return this.queryWithRetryAndRelease(query, values, {
-          cacheKey,
-          priority: queuePriority,
-          external: queryBody.external,
-          requestId: queryBody.requestId,
-          persistent: queryBody.persistent,
-          dataSource: queryBody.dataSource,
-          useCsvQuery: queryBody.useCsvQuery,
-          lambdaTypes: queryBody.lambdaTypes,
-          aliasNameToMember: queryBody.aliasNameToMember,
-        });
+        return this.queryWithRetryAndRelease(
+          query,
+          values,
+          {
+            cacheKey,
+            priority: queuePriority,
+            external: queryBody.external,
+            requestId: queryBody.requestId,
+            persistent: queryBody.persistent,
+            dataSource: queryBody.dataSource,
+            useCsvQuery: queryBody.useCsvQuery,
+            lambdaTypes: queryBody.lambdaTypes,
+            aliasNameToMember: queryBody.aliasNameToMember,
+          }
+        );
       } else {
         return {
           data: await this.queryWithRetryAndRelease(
@@ -291,6 +295,7 @@ export class QueryCache {
         cacheKey,
         renewalThreshold,
         {
+          forceNoCache,
           external: queryBody.external,
           requestId: queryBody.requestId,
           dataSource: queryBody.dataSource,
@@ -308,6 +313,7 @@ export class QueryCache {
         cacheKey,
         renewalThreshold,
         {
+          forceNoCache,
           external: queryBody.external,
           requestId: queryBody.requestId,
           dataSource: queryBody.dataSource,
@@ -770,6 +776,7 @@ export class QueryCache {
       requestId?: string,
       skipRefreshKeyWaitForRenew?: boolean,
       external?: boolean,
+      forceNoCache?: boolean,
       dataSource: string,
       useCsvQuery?: boolean,
       lambdaTypes?: TableStructure,
@@ -803,6 +810,7 @@ export class QueryCache {
                 this.queryRedisKey([query, values]),
               ],
               waitForRenew: true,
+              forceNoCache: options.forceNoCache,
               external: options.external,
               requestId: options.requestId,
               dataSource: options.dataSource,
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
index 578a1c4900b78..037361854675c 100644
--- a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
+++ b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -771,7 +771,7 @@ export class BaseQuery {
     }
     const hasMemberExpressions = this.allMembersConcat(false).some(m => m.isMemberExpression);
 
-    if (!this.options.preAggregationQuery && !this.customSubQueryJoins.length && !hasMemberExpressions) {
+    if (this.options.cacheMode !== 'no-cache' && !this.options.preAggregationQuery && !this.customSubQueryJoins.length && !hasMemberExpressions) {
       preAggForQuery =
         this.preAggregations.findPreAggregationForQuery();
       if (this.options.disableExternalPreAggregations && preAggForQuery?.preAggregation.external) {
@@ -844,6 +844,10 @@ export class BaseQuery {
   }
 
   externalPreAggregationQuery() {
+    if (this.options.cacheMode === 'no-cache') {
+      return false;
+    }
+
     if (!this.options.preAggregationQuery && !this.options.disableExternalPreAggregations && this.externalQueryClass) {
       const preAggregationForQuery = this.preAggregations.findPreAggregationForQuery();
       if (preAggregationForQuery?.preAggregation.external) {
diff --git a/packages/cubejs-server-core/src/core/OrchestratorApi.ts b/packages/cubejs-server-core/src/core/OrchestratorApi.ts
index e715e55a9be69..59f73ec26d398 100644
--- a/packages/cubejs-server-core/src/core/OrchestratorApi.ts
+++ b/packages/cubejs-server-core/src/core/OrchestratorApi.ts
@@ -181,9 +181,7 @@ export class OrchestratorApi {
    */
   public async testConnection() {
     if (this.options.rollupOnlyMode) {
-      return Promise.all([
-        this.testDriverConnection(this.options.externalDriverFactory, DriverType.External),
-      ]);
+      return this.testDriverConnection(this.options.externalDriverFactory, DriverType.External);
     } else {
       return Promise.all([
         ...Object.keys(this.seenDataSources).map(