diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05602e41e..bdcb04ae6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -115,58 +115,66 @@ jobs:
             ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-
             ${{ runner.os }}-go-
 
+      # Package managers are only needed for Package Handlers tests (fix functionality)
       - name: Install npm
+        if: matrix.suite.package == 'packagehandlers'
         uses: actions/setup-node@v3
         with:
           node-version: "16"
 
       - name: Setup Python3
+        if: matrix.suite.package == 'packagehandlers'
         uses: actions/setup-python@v4
         with:
           python-version: "3.x"
 
       - name: Install python components
+        if: matrix.suite.package == 'packagehandlers'
         run: python -m pip install pipenv poetry
 
       - name: Install Mono on macOS
+        if: matrix.suite.package == 'packagehandlers' && runner.os == 'macOS'
         run: brew install mono
-        if: runner.os == 'macOS'
 
       - name: Install dotnet
+        if: matrix.suite.package == 'packagehandlers'
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: "6.x"
 
       - name: Install Mono on linux
-        if: runner.os == 'Linux'
+        if: matrix.suite.package == 'packagehandlers' && runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y mono-devel
 
       - name: Install NuGet on Linux
+        if: matrix.suite.package == 'packagehandlers' && (runner.os == 'Linux' || runner.os == 'macOS')
         uses: nuget/setup-nuget@v2
         with:
           nuget-version: 6.11.0
-        if: runner.os == 'Linux' || runner.os == 'macOS'
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
-        if: runner.os == 'Linux'
+        if: matrix.suite.package == 'packagehandlers' && runner.os == 'Linux'
         with:
           packages: apt-transport-https dirmngr gnupg ca-certificates
           version: 1.0
 
       - name: Install Pnpm
+        if: matrix.suite.package == 'packagehandlers'
         uses: pnpm/action-setup@v3
         with:
           version: 8
 
       - name: Install Java
+        if: matrix.suite.package == 'packagehandlers'
         uses: actions/setup-java@v4
         with:
           distribution: "adopt"
           java-version: "11"
 
       - name: Install Conan
+        if: matrix.suite.package == 'packagehandlers'
         run: |
           python -m pip install conan
           conan profile detect
@@ -204,6 +212,15 @@ jobs:
         with:
           go-version: 1.23.x
           cache: false
+
+      - name: Go Cache Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Go Cache Build & Tests
         uses: actions/cache@v4
         with:
@@ -249,6 +266,15 @@ jobs:
         with:
           go-version: 1.23.x
           cache: false
+
+      - name: Go Cache Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Go Cache Build & Tests
         uses: actions/cache@v4
         with:
@@ -294,6 +320,15 @@ jobs:
         with:
           go-version: 1.23.x
           cache: false
+
+      - name: Go Cache Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Go Cache Build & Tests
         uses: actions/cache@v4
         with:
@@ -343,6 +378,14 @@ jobs:
           chmod +x $bb_script_path
           sh $bb_script_path
 
+      - name: Go Cache Dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Go Cache Build & Tests
         uses: actions/cache@v4
         with: