diff --git a/.github/workflows/build_openssl.sh b/.github/workflows/build_openssl.sh
index c7855a7f3..013fcf426 100755
--- a/.github/workflows/build_openssl.sh
+++ b/.github/workflows/build_openssl.sh
@@ -78,4 +78,5 @@ elif [[ "${TYPE}" == "boringssl" ]]; then
   # delete binaries we don't need
   rm -rf "${OSSL_PATH}/bin"
   popd
+  rm -rf boringssl/
 fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6594a665e..388dd9790 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,9 +97,10 @@ jobs:
         timeout-minutes: 2
         with:
           path: ${{ github.workspace }}/osslcache
-          # When altering the openssl build process you may need to increment the value on the end of this cache key
-          # so that you can prevent it from fetching the cache and skipping the build step.
-          key: ${{ matrix.PYTHON.OPENSSL.TYPE }}-${{ matrix.PYTHON.OPENSSL.VERSION }}-${{ env.OPENSSL_HASH }}-8
+          # When altering the openssl build process you may need to increment
+          # the value on the end of this cache key so that you can prevent it
+          # from fetching the cache and skipping the build step.
+          key: ${{ matrix.PYTHON.OPENSSL.TYPE }}-${{ matrix.PYTHON.OPENSSL.VERSION }}-${{ env.OPENSSL_HASH }}-9
         if: matrix.PYTHON.OPENSSL
       - name: Build custom OpenSSL/LibreSSL
         run: .github/workflows/build_openssl.sh