From 58540eab5e692943ee6531e0ff9d2c73711c19dc Mon Sep 17 00:00:00 2001
From: Roo Code <roomote@roocode.com>
Date: Tue, 13 Jan 2026 17:25:50 +0000
Subject: [PATCH] feat(bedrock): enable prompt caching toggle for custom ARN
 and default to ON

---
 webview-ui/src/components/settings/providers/Bedrock.tsx | 2 +-
 webview-ui/src/components/ui/hooks/useSelectedModel.ts   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/webview-ui/src/components/settings/providers/Bedrock.tsx b/webview-ui/src/components/settings/providers/Bedrock.tsx
index 9d314ee2015..c5c57e2390f 100644
--- a/webview-ui/src/components/settings/providers/Bedrock.tsx
+++ b/webview-ui/src/components/settings/providers/Bedrock.tsx
@@ -198,7 +198,7 @@ export const Bedrock = ({ apiConfiguration, setApiConfigurationField, selectedMo
 			{selectedModelInfo?.supportsPromptCache && (
 				<>
 					<Checkbox
-						checked={apiConfiguration?.awsUsePromptCache || false}
+						checked={apiConfiguration?.awsUsePromptCache ?? true}
 						onChange={handleInputChange("awsUsePromptCache", noTransform)}>
 						<div className="flex items-center gap-1">
 							<span>{t("settings:providers.enablePromptCaching")}</span>
diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts
index 65be3e21fe4..3324fbabbb2 100644
--- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts
+++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts
@@ -212,10 +212,13 @@ function getSelectedModel({
 			const baseInfo = bedrockModels[id as keyof typeof bedrockModels]
 
 			// Special case for custom ARN.
+			// Custom ARN is treated as an advanced option where users know what they are doing.
+			// Since custom ARNs often point to newer Claude models that support prompt caching,
+			// we enable the prompt cache toggle to let users decide.
 			if (id === "custom-arn") {
 				return {
 					id,
-					info: { maxTokens: 5000, contextWindow: 128_000, supportsPromptCache: false, supportsImages: true },
+					info: { maxTokens: 5000, contextWindow: 128_000, supportsPromptCache: true, supportsImages: true },
 				}
 			}