diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 28daa826b73d..31234b2bd0a1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -25,3 +25,4 @@ jobs:
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest
+          args: --timeout 15m
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
index a9e2efbac707..df04bfe19521 100644
--- a/.github/workflows/sims.yml
+++ b/.github/workflows/sims.yml
@@ -39,10 +39,6 @@ jobs:
         run: go version
       - name: Install runsim
         run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0
-      - uses: actions/cache@v2.1.3
-        with:
-          path: ~/go/bin
-          key: ${{ runner.os }}-go-runsim-binary
 
   test-sim-nondeterminism:
     runs-on: ubuntu-latest
@@ -54,21 +50,9 @@ jobs:
           go-version: 1.19
       - name: Display go version
         run: go version
-      - uses: technote-space/get-diff-action@v4
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - uses: actions/cache@v2.1.3
-        with:
-          path: ~/go/bin
-          key: ${{ runner.os }}-go-runsim-binary
-        if: env.GIT_DIFF
       - name: test-sim-nondeterminism
         run: |
           make test-sim-nondeterminism
-        if: env.GIT_DIFF
 
   test-sim-import-export:
     runs-on: ubuntu-latest
@@ -80,23 +64,13 @@ jobs:
           go-version: 1.19
       - name: Display go version
         run: go version
-      - uses: technote-space/get-diff-action@v4
-        with:
-          SUFFIX_FILTER: |
-            **/**.go
-            go.mod
-            go.sum
-          SET_ENV_NAME_INSERTIONS: 1
-          SET_ENV_NAME_LINES: 1
       - uses: actions/cache@v2.1.3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
-        if: env.GIT_DIFF
       - name: test-sim-import-export
         run: |
           make test-sim-import-export
-        if: env.GIT_DIFF
 
   test-sim-after-import:
     runs-on: ubuntu-latest
@@ -108,23 +82,13 @@ jobs:
           go-version: 1.19
       - name: Display go version
         run: go version
-      - uses: technote-space/get-diff-action@v4
-        with:
-          SUFFIX_FILTER: |
-            **/**.go
-            go.mod
-            go.sum
-          SET_ENV_NAME_INSERTIONS: 1
-          SET_ENV_NAME_LINES: 1
       - uses: actions/cache@v2.1.3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
-        if: env.GIT_DIFF
       - name: test-sim-after-import
         run: |
           make test-sim-after-import
-        if: env.GIT_DIFF
 
   test-sim-multi-seed-short:
     runs-on: ubuntu-latest
@@ -136,20 +100,10 @@ jobs:
           go-version: 1.19
       - name: Display go version
         run: go version
-      - uses: technote-space/get-diff-action@v4
-        with:
-          SUFFIX_FILTER: |
-            **/**.go
-            go.mod
-            go.sum
-          SET_ENV_NAME_INSERTIONS: 1
-          SET_ENV_NAME_LINES: 1
       - uses: actions/cache@v2.1.3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
-        if: env.GIT_DIFF
       - name: test-sim-multi-seed-short
         run: |
           make test-sim-multi-seed-short
-        if: env.GIT_DIFF