diff --git a/src/lib/azure/services/api-management/main.ts b/src/lib/azure/services/api-management/main.ts
index 59860f2b..b72c1960 100644
--- a/src/lib/azure/services/api-management/main.ts
+++ b/src/lib/azure/services/api-management/main.ts
@@ -241,11 +241,12 @@ export class AzureApiManagementManager {
                   string fullPath = context.Request.Url.Path.ToLower();
 
                   // Query parameters
-                  string query = context.Request.Url.Query.ToLower();
+                  string query = context.Request.Url.QueryString.ToLower();
 
                   // Construct final cache key (no Accept header needed for JSON-only APIs)
                   return $"{apiName}:{apiVersion}:{fullPath}:{query}";
-              }" />`
+              }" />
+              <set-variable name="bypassCache" value="@(context.Request.Headers.GetValueOrDefault("X-Bypass-Cache", "false").ToLower())" />`
 
         if (operation.caching.enableCacheSet) {
           cacheSetInboundPolicy = `<choose>