diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 34a56b301..b89da744f 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -48,9 +48,9 @@ jobs:
           ~/.nuget/packages/argon2.bindings
           Projects/Argon2/*
           packages/Argon2.Bindings*.nupkg
-        key: ${{ matrix.os }}-argon2-cache-v3-${{ hashFiles('Projects/Argon2/*') }}
+        key: ${{ matrix.os }}-argon2-cache-v4-${{ hashFiles('Projects/Argon2/*') }}
         restore-keys: |
-          ${{ matrix.os }}-argon2-cache-v3
+          ${{ matrix.os }}-argon2-cache-v4
     - name: ZLib Library Cache
       id: zlib-cache
       uses: actions/cache@v2
@@ -59,14 +59,20 @@ jobs:
           ~/.nuget/packages/zlib.bindings
           Projects/ZLib/*
           packages/ZLib.Bindings*.nupkg
-        key: ${{ matrix.os }}-zlib-cache-v3-${{ hashFiles('Projects/ZLib/*') }}
+        key: ${{ matrix.os }}-zlib-cache-v4-${{ hashFiles('Projects/ZLib/*') }}
         restore-keys: |
-          ${{ matrix.os }}-zlib-cache-v3
+          ${{ matrix.os }}-zlib-cache-v4
     - name: Build ZLib
       run: dotnet build -c Release Projects/ZLib/ZLib.csproj
+    - name: Pack ZLib NuGet
+      if: steps.nuget-cache.outputs.cache-hit != 'true'
+      run: dotnet pack -c Release -o packages Projects/ZLib/ZLib.csproj
     - name: Build Argon2
       run: dotnet build -c Release Projects/Argon2/Argon2.csproj
-    - name: Install dependencies
+    - name: Pack Argon2 NuGet
+      if: steps.nuget-cache.outputs.cache-hit != 'true'
+      run: dotnet pack -c Release -o packages Projects/Argon2/Argon2.csproj
+    - name: Restore dependencies
       if: steps.nuget-cache.outputs.cache-hit != 'true' || steps.argon2-cache.outputs.cache-hit != 'true' || steps.zlib-cache.outputs.cache-hit != 'true'
       run: dotnet restore --force-evaluate
     - name: Build Server