diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d9d47e626..4b374abded 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -239,7 +239,7 @@ jobs:
         - uses: actions/cache@v3
           with:
             path: /opt/openssl
-            key: openssl-${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-4
+            key: openssl-${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-5
           if: matrix.library.version != 'vendored'
           id: openssl-cache
         - run: |
@@ -314,7 +314,7 @@ jobs:
 
               # Copy stuff around so it's all as the build system expects.
               cp -r ../rust/ "$OPENSSL_DIR/rust"
-              cp -r rust "$OPENSSL_DIR/build/"
+              cp -r rust/ "$OPENSSL_DIR/build/rust"
               mkdir -p "$OPENSSL_DIR/crypto/"
               mkdir -p "$OPENSSL_DIR/ssl/"
               cp "$OPENSSL_DIR/lib/libcrypto.a" "$OPENSSL_DIR/crypto/"