From edaf255e3ec93687cb9ae93fdc4a693e1c3d3b47 Mon Sep 17 00:00:00 2001
From: Hemal Shah <hemal@gradientedge.com>
Date: Wed, 19 Nov 2025 10:17:17 +0000
Subject: [PATCH 1/3] feat(apim cache): Add default caching type to cache
 policies

---
 src/lib/azure/services/api-management/main.ts  | 8 ++++----
 src/lib/azure/services/api-management/types.ts | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/azure/services/api-management/main.ts b/src/lib/azure/services/api-management/main.ts
index ae7fc6b9..78bedccd 100644
--- a/src/lib/azure/services/api-management/main.ts
+++ b/src/lib/azure/services/api-management/main.ts
@@ -266,7 +266,7 @@ export class AzureApiManagementManager {
           cacheSetInboundPolicy = `<choose>
                   <when condition="@((string)context.Variables["bypassCache"] != "true")">
                       <!-- Attempt to retrieve cached response -->
-                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" />
+                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" caching-type="${operation.caching.cachingType || 'prefer-external'}"/>
 
                       <!-- If cache hit, return cached response -->
                       <choose>
@@ -288,13 +288,13 @@ export class AzureApiManagementManager {
                       </choose>
                   </when>
                   <when condition="@((string)context.Variables["bypassCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"]) caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                   </when>
               </choose>`
           cacheSetOutboundPolicy = `<!-- Store the response body in cache -->
               <choose>
                   <when condition="@(context.Response.StatusCode == 200)">
-                      <cache-store-value key="@((string)context.Variables["customCacheKey"])" value="@(context.Response.Body.As<string>(preserveContent: true))" duration="${operation.caching.ttlInSecs ?? 900}" />
+                      <cache-store-value key="@((string)context.Variables["customCacheKey"])" value="@(context.Response.Body.As<string>(preserveContent: true))" duration="${operation.caching.ttlInSecs ?? 900}" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                       <!-- Add cache status header -->
                       <set-header name="X-Apim-Cache-Status" exists-action="override">
                           <value>MISS</value>
@@ -315,7 +315,7 @@ export class AzureApiManagementManager {
               <!-- Allow admin to clear specific cache entries -->
               <choose>
                   <when condition="@((string)context.Variables["clearCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}"/>
                       <return-response>
                           <set-status code="200" reason="OK" />
                           <set-body>Cache entry removed successfully</set-body>
diff --git a/src/lib/azure/services/api-management/types.ts b/src/lib/azure/services/api-management/types.ts
index 1f9a3f21..d2afb781 100644
--- a/src/lib/azure/services/api-management/types.ts
+++ b/src/lib/azure/services/api-management/types.ts
@@ -30,6 +30,7 @@ export interface ApiManagementApiCaching {
   enableCacheSet?: boolean
   enableCacheInvalidation?: boolean
   ttlInSecs?: number
+  cachingType?: string
 }
 
 export interface ApiManagementApiRateLimit {

From 5a5af83c8aeb7857a49767eabfb403abc08f61e5 Mon Sep 17 00:00:00 2001
From: Hemal Shah <hemal@gradientedge.com>
Date: Wed, 19 Nov 2025 10:21:52 +0000
Subject: [PATCH 2/3] feat(apim cache): Add default caching type to cache
 policies

---
 src/lib/azure/services/api-management/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/azure/services/api-management/main.ts b/src/lib/azure/services/api-management/main.ts
index 78bedccd..2e5252c2 100644
--- a/src/lib/azure/services/api-management/main.ts
+++ b/src/lib/azure/services/api-management/main.ts
@@ -266,7 +266,7 @@ export class AzureApiManagementManager {
           cacheSetInboundPolicy = `<choose>
                   <when condition="@((string)context.Variables["bypassCache"] != "true")">
                       <!-- Attempt to retrieve cached response -->
-                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" caching-type="${operation.caching.cachingType || 'prefer-external'}"/>
+                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
 
                       <!-- If cache hit, return cached response -->
                       <choose>
@@ -315,7 +315,7 @@ export class AzureApiManagementManager {
               <!-- Allow admin to clear specific cache entries -->
               <choose>
                   <when condition="@((string)context.Variables["clearCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}"/>
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                       <return-response>
                           <set-status code="200" reason="OK" />
                           <set-body>Cache entry removed successfully</set-body>

From a215e28ef988db957b665769b2a83fbaadfd9316 Mon Sep 17 00:00:00 2001
From: Hemal Shah <hemal@gradientedge.com>
Date: Wed, 19 Nov 2025 10:22:48 +0000
Subject: [PATCH 3/3] feat(apim cache): Add default caching type to cache
 policies

---
 src/lib/azure/services/api-management/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/azure/services/api-management/main.ts b/src/lib/azure/services/api-management/main.ts
index 2e5252c2..7688d5b3 100644
--- a/src/lib/azure/services/api-management/main.ts
+++ b/src/lib/azure/services/api-management/main.ts
@@ -288,7 +288,7 @@ export class AzureApiManagementManager {
                       </choose>
                   </when>
                   <when condition="@((string)context.Variables["bypassCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"]) caching-type="${operation.caching.cachingType || 'prefer-external'}" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                   </when>
               </choose>`
           cacheSetOutboundPolicy = `<!-- Store the response body in cache -->