diff --git a/.github/workflows/cache-cleanup.yml b/.github/workflows/cache-cleanup.yml
index 23de39f3..fd6bc47e 100644
--- a/.github/workflows/cache-cleanup.yml
+++ b/.github/workflows/cache-cleanup.yml
@@ -12,19 +12,26 @@ jobs:
       - name: Cleanup
         run: |
           gh extension install actions/gh-actions-cache
-          
-          REPO=${{ github.repository }}
+
+          REPO="${{ github.repository }}"
           BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
 
-          echo "Fetching list of cache key"
-          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+          while true; do
+              echo "Fetching list of cache key"
+              cacheKeysForPR="$(gh actions-cache list -R "$REPO" -B "$BRANCH" -L 100 | cut -f 1 )"
 
-          ## Setting this to not fail the workflow while deleting cache keys. 
-          set +e
-          echo "Deleting caches..."
-          for cacheKey in $cacheKeysForPR
-          do
-              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+              if [ -z "$cacheKeysForPR" ]; then
+                  break
+              fi
+
+              ## Setting this to not fail the workflow while deleting cache keys. 
+              set +e
+              echo "Deleting caches..."
+              for cacheKey in $cacheKeysForPR
+              do
+                  echo Removing "$cacheKey"
+                  gh actions-cache delete "$cacheKey" -R "$REPO" -B "$BRANCH" --confirm
+              done
           done
           echo "Done"
         env: