diff --git a/packages/containers/README.md b/packages/containers/README.md
index b67dcbb2d8..21806d7f46 100644
--- a/packages/containers/README.md
+++ b/packages/containers/README.md
@@ -8,7 +8,7 @@ Images
 
 - `base`: Ubuntu 24.04 with common build tools and utilities
 - `bun-node`: `base` plus Bun and Node.js 24
-- `jetbrains`: `bun-node` plus Java 21 and the pre-cached Gradle distribution
+- `jetbrains`: `bun-node` plus Java 21, JBR font libraries, and pre-cached Gradle and Bun packages <!-- kilocode_change -->
 - `rust`: `bun-node` plus Rust (stable, minimal profile)
 - `tauri-linux`: `rust` plus Tauri Linux build dependencies
 - `publish`: `bun-node` plus Docker CLI and AUR tooling
diff --git a/packages/containers/jetbrains/Dockerfile b/packages/containers/jetbrains/Dockerfile
index 2c309df5f1..5a9d7193e1 100644
--- a/packages/containers/jetbrains/Dockerfile
+++ b/packages/containers/jetbrains/Dockerfile
@@ -1,7 +1,18 @@
 # kilocode_change start
 ARG REGISTRY=ghcr.io/kilo-org
+FROM ${REGISTRY}/build/bun-node:24.04 AS bun-cache
+
+WORKDIR /src
+COPY package.json bun.lock bunfig.toml ./
+COPY packages ./packages
+COPY patches ./patches
+RUN bun install --frozen-lockfile --ignore-scripts --cache-dir=/bun-cache
+
 FROM ${REGISTRY}/build/bun-node:24.04
 
+COPY --from=bun-cache /bun-cache/ /opt/bun/install/cache/
+ENV BUN_INSTALL_CACHE_DIR=/opt/bun/install/cache
+
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GRADLE_VERSION=9.4.1