diff --git a/Dockerfile b/Dockerfile
index ea799ae..1948b14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -173,6 +173,34 @@ RUN \
     npm i && \
     npx webpack --mode production
 
+RUN \
+  rsync -av --progress --delete /root/.config/ /home/${UNAME}/.config/
+
+RUN \
+    chown -R ${UNAME}:${GNAME} /home/${UNAME}
+
+USER ${UNAME}
+
+ENV \
+  GID="1000" \
+  GNAME="neovim" \
+  LANG=en_US.utf8 \
+  NVIM_APPNAME=nvim \
+  NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \
+  NV_DARCULA_ENABLE_COC=${NV_DARCULA_ENABLE_COC} \
+  PATH="/nvim-${NVIM_OS}-${NVIM_ARCH}/bin:/python/bin:/home/neovim/go/bin:/home/neovim/.local/bin:/home/neovim/flutter/bin:/home/neovim/.pub-cache/bin:/usr/bin/core_perl:${PATH}" \
+  PYTHONPATH="/python" \
+  SHELL="/bin/bash" \
+  TMPDIR=/tmp \
+  UID="1000" \
+  UNAME="neovim"
+
+RUN \
+  curl -fsSL https://cli.kiro.dev/install | bash
+
+RUN \
+  curl -fsSL https://chatgpt.com/codex/install.sh | bash
+
 RUN \
   if [ "$NV_DARCULA_ENABLE_COC" = "true" ]; then \
     nvim --headless "+CocInstall -sync coc-calc" "+qall" && \
@@ -217,33 +245,7 @@ RUN \
     "+lua vim.defer_fn(function() vim.cmd('qall') end, 60000)"
 
 RUN \
-  rsync -av --progress --delete /root/.config/ /home/${UNAME}/.config/ && \
-  rsync -av --progress --delete /root/.local/ /home/${UNAME}/.local/
-
-RUN \
-    chown -R ${UNAME}:${GNAME} /home/${UNAME}
-
-USER ${UNAME}
-
-ENV \
-  GID="1000" \
-  GNAME="neovim" \
-  LANG=en_US.utf8 \
-  NVIM_APPNAME=nvim \
-  NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \
-  NV_DARCULA_ENABLE_COC=${NV_DARCULA_ENABLE_COC} \
-  PATH="/nvim-${NVIM_OS}-${NVIM_ARCH}/bin:/python/bin:/home/neovim/go/bin:/home/neovim/.local/bin:/home/neovim/flutter/bin:/home/neovim/.pub-cache/bin:/usr/bin/core_perl:${PATH}" \
-  PYTHONPATH="/python" \
-  SHELL="/bin/bash" \
-  TMPDIR=/tmp \
-  UID="1000" \
-  UNAME="neovim"
-
-RUN \
-  curl -fsSL https://cli.kiro.dev/install | bash
-
-RUN \
-  curl -fsSL https://chatgpt.com/codex/install.sh | bash
+    nvim --headless "+MasonToolsInstallSync" "+qall"
 
 RUN \
   cd "/home/${UNAME}" && \
@@ -253,9 +255,6 @@ RUN \
   flutter doctor && \
   flutter pub global activate dart_style
 
-RUN \
-    nvim --headless "+MasonToolsInstallSync" "+qall"
-
 ENTRYPOINT ["/entrypoint.sh"]
 
 # vim:filetype=dockerfile
diff --git a/dviml_common.sh b/dviml_common.sh
index 886ffcd..6b5281d 100755
--- a/dviml_common.sh
+++ b/dviml_common.sh
@@ -24,7 +24,6 @@ CURRENT_DIR="$(pwd)"
 APP_DIR="${HOME}/.nv_darcula/${NVIM_APPNAME}"
 APP_PERSIST_DIR="${APP_DIR}/persist"
 
-mkdir -p "${APP_PERSIST_DIR}/cache"
 mkdir -p "${APP_PERSIST_DIR}/codex"
 mkdir -p "${APP_PERSIST_DIR}/kiro/kiro"
 mkdir -p "${APP_PERSIST_DIR}/kiro/kiro-cli"
@@ -77,7 +76,6 @@ docker run --rm -it \
   --privileged=true \
   -e TERM="$TERM" \
   -v "${CURRENT_DIR}":"${WORKSPACE_DIR}" \
-  -v "${APP_PERSIST_DIR}/cache":/home/neovim/.cache:z \
   -v "${APP_PERSIST_DIR}/codex":/home/neovim/.codex:z \
   -v "${APP_PERSIST_DIR}/kiro/kiro":/home/neovim/.kiro:z \
   -v "${APP_PERSIST_DIR}/kiro/kiro-cli":/home/neovim/.local/share/kiro-cli:z \