diff --git a/project-lakitu/app-admin/extensions-manager/extensions-manager-0.0.1-r6.ebuild b/project-lakitu/app-admin/extensions-manager/extensions-manager-0.0.1-r7.ebuild
similarity index 100%
rename from project-lakitu/app-admin/extensions-manager/extensions-manager-0.0.1-r6.ebuild
rename to project-lakitu/app-admin/extensions-manager/extensions-manager-0.0.1-r7.ebuild
diff --git a/project-lakitu/app-admin/extensions-manager/files/cos-extensions.sh b/project-lakitu/app-admin/extensions-manager/files/cos-extensions.sh
index 60b5163..6c7a73e 100755
--- a/project-lakitu/app-admin/extensions-manager/files/cos-extensions.sh
+++ b/project-lakitu/app-admin/extensions-manager/files/cos-extensions.sh
@@ -14,6 +14,7 @@
 readonly COS_GPU_INSTALLER="${COS_GPU_INSTALLER:-\
 gcr.io/cos-cloud/cos-gpu-installer:v2.0.6}"
 readonly OS_RELEASE="/etc/os-release"
+readonly EXTENSIONS_CACHE="/var/lib/cos-extensions"
 
 usage() {
   cat <<EOF
@@ -33,6 +34,14 @@
     install <extension> [-- -<version>]   install a COS extension. If no version
                                           is given, then the default version
                                           will be installed.
+
+Additional Description:
+    ${PROG_NAME} install gpu --use-build-tools-cache
+    The gpu extension can be invoked with a --use-build-tools-cache
+    optional argument that can be used to cache the toolchain for the installer.
+    Caching the toolchain carries the overhead of ~1GB disk space on the
+    stateful partition. It may also help to save time on downloading the
+    toolchain during the installation, after the first run.
 }
 EOF
   exit "${1}"
@@ -116,14 +125,33 @@
 
 run_gpu_installer() {
   check_arch
-  /usr/bin/docker run --rm \
-    --name="cos-gpu-installer" \
-    --privileged \
-    --net=host \
-    --pid=host \
-    --volume /dev:/dev \
-    --volume /:/root \
-    "${COS_GPU_INSTALLER}" "$@"
+  local use_build_cache=false
+
+  local installer_args=()
+  for i in "$@"; do
+    if [[ $i == '--use-build-tools-cache' ]]; then
+      use_build_cache=true
+    else
+      installer_args+=($i)
+    fi
+  done
+
+  local docker_args=(
+    --rm
+    --name="cos-gpu-installer"
+    --privileged
+    --net=host
+    --pid=host
+    --volume /dev:/dev
+    --volume /:/root
+  )
+
+  if [[ "$use_build_cache" = true ]]; then
+    docker_args+=(--volume ${EXTENSIONS_CACHE}/:/build/)
+  fi
+
+  /usr/bin/docker run "${docker_args[@]}" "${COS_GPU_INSTALLER}"\
+    "${installer_args[@]}"
 }
 
 main() {