diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb8269c69e..033288ddb9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,28 +30,28 @@ jobs:
         platform: [macos-latest, ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - id: go-cache-paths
-        run: |
-          echo "::set-output name=go-build::$(go env GOCACHE)"
-          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
       - uses: actions/setup-go@v2
         with:
           go-version: 1.18
           stable: true
           check-latest: true
 
+      - name: Set cache variables
+        id: go-cache-paths
+        run: |
+          echo "::set-output name=go-build::$(go env GOCACHE)"
+          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
+
       - uses: actions/checkout@v3
 
-      # cache go build cache
-      - name: Cache go modules
+      - name: Go build cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-build
 
-      # cache go mod cache
-      - name: Cache go modules
+      - name: Go modules cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
@@ -65,28 +65,28 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - id: go-cache-paths
-        run: |
-          echo "::set-output name=go-build::$(go env GOCACHE)"
-          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
       - uses: actions/setup-go@v2
         with:
           go-version: 1.18
           stable: true
           check-latest: true
 
+      - name: Set cache variables
+        id: go-cache-paths
+        run: |
+          echo "::set-output name=go-build::$(go env GOCACHE)"
+          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
+
       - uses: actions/checkout@v3
 
-      # cache go build cache
-      - name: Cache go modules
+      - name: Go build cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-build
 
-      # cache go mod cache
-      - name: Cache go modules
+      - name: Go modules cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
diff --git a/.github/workflows/code-cov.yml b/.github/workflows/code-cov.yml
index faba86bf30..58586c3ffd 100644
--- a/.github/workflows/code-cov.yml
+++ b/.github/workflows/code-cov.yml
@@ -24,28 +24,28 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - id: go-cache-paths
-        run: |
-          echo "::set-output name=go-build::$(go env GOCACHE)"
-          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
       - uses: actions/setup-go@v2
         with:
           go-version: 1.18
           stable: true
           check-latest: true
 
+      - name: Set cache variables
+        id: go-cache-paths
+        run: |
+          echo "::set-output name=go-build::$(go env GOCACHE)"
+          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
+
       - uses: actions/checkout@v3
 
-      # cache go build cache
-      - name: Cache go modules
+      - name: Go build cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-build
 
-      # cache go mod cache
-      - name: Cache go modules
+      - name: Go modules cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b608341cb0..fc51cf9ab9 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -29,29 +29,28 @@ jobs:
           ]
     runs-on: ubuntu-latest
     steps:
-      - id: go-cache-paths
-        run: |
-          echo "::set-output name=go-build::$(go env GOCACHE)"
-          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
-
       - uses: actions/setup-go@v2
         with:
           go-version: 1.18
           stable: true
           check-latest: true
 
+      - name: Set cache variables
+        id: go-cache-paths
+        run: |
+          echo "::set-output name=go-build::$(go env GOCACHE)"
+          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
+
       - uses: actions/checkout@v3
 
-      # cache go build cache
-      - name: Cache go modules
+      - name: Go build cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-build
 
-      # cache go mod cache
-      - name: Cache go modules
+      - name: Go modules cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index af1dd8dc78..b5f023e7ee 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -24,29 +24,28 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - id: go-cache-paths
-        run: |
-          echo "::set-output name=go-build::$(go env GOCACHE)"
-          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
-
       - uses: actions/setup-go@v2
         with:
           go-version: 1.18
           stable: true
           check-latest: true
 
+      - name: Set cache variables
+        id: go-cache-paths
+        run: |
+          echo "::set-output name=go-build::$(go env GOCACHE)"
+          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
+
       - uses: actions/checkout@v3
 
-      # cache go build cache
-      - name: Cache go modules
+      - name: Go build cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-build
 
-      # cache go mod cache
-      - name: Cache go modules
+      - name: Go modules cache
         uses: actions/cache@v3
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}