diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 193d033a..dfbc6bc4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -38,6 +38,7 @@ jobs:
           path: |
             ~/.pnpm-store
             D:\.pnpm-store
+            ./node_modules
           key: "setupcpp-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
           restore-keys: |
             "setupcpp-cache-OS:${{ matrix.os }}-"
@@ -151,6 +152,7 @@ jobs:
           path: |
             ~/.pnpm-store
             D:\.pnpm-store
+            ./node_modules
           key: "setupcpp-docker-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
           restore-keys: |
             "setupcpp-docker-cache-OS:${{ matrix.os }}"
diff --git a/dev/docker/__tests__/arch.dockerfile b/dev/docker/__tests__/arch.dockerfile
index e53ab292..a755fd39 100644
--- a/dev/docker/__tests__/arch.dockerfile
+++ b/dev/docker/__tests__/arch.dockerfile
@@ -15,7 +15,7 @@ RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true
 ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
-FROM setup-cpp AS example-builder
+FROM base AS example-builder
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
diff --git a/dev/docker/__tests__/fedora.dockerfile b/dev/docker/__tests__/fedora.dockerfile
index 41e25142..94040388 100644
--- a/dev/docker/__tests__/fedora.dockerfile
+++ b/dev/docker/__tests__/fedora.dockerfile
@@ -14,7 +14,7 @@ RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true
 ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
-FROM setup-cpp AS example-builder
+FROM base AS example-builder
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
diff --git a/package.json b/package.json
index 7251853f..83791ff3 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,6 @@
   "repository": "https://github.com/aminya/setup-cpp",
   "license": "Apache-2.0",
   "author": "Amin Yahyaabadi",
-  "exports": {
-    "import": "./dist/modern/setup-cpp.mjs",
-    "require": "./dist/legacy/setup-cpp.js"
-  },
   "main": "dist/legacy/setup-cpp.js",
   "actions": "./dist/actions/setup-cpp.js",
   "modern": "./dist/modern/setup-cpp.js",