diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0fb3dc185..b466a9b3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get -y install openssl libssl-dev sqlite3 libsqlite3-dev
       - name: Cache gambit
+        id: cache-gambit
         uses: actions/cache@v2
         with:
           path: $GITHUB_WORKSPACE/gambit
@@ -20,13 +21,17 @@ jobs:
           repository: 'gambit/gambit'
           ref: ${{ matrix.gambit-version }}
           path: 'gambit'
+        if: steps.cache-gambit.outputs.cache-hit != 'true'
       - name: Build and install Gambit
+        if: steps.cache-gambit.outputs.cache-hit != 'true'
         run: |
           pushd gambit
           ./configure --prefix=$HOME/gambit --enable-single-host
           make
           make install
           popd
+      - name: Setup links to gambit executables
+        run: |
           sudo ln -sf $HOME/gambit/bin/gsi /bin/gsi
           sudo ln -sf $HOME/gambit/bin/gsi-script /bin/gsi-script
           sudo ln -sf $HOME/gambit/bin/gsc /bin/gsc