diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 3782c935c..880f2d329 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -24,33 +24,22 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
-
-      - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: ${{ matrix.java-version }}
 
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       - name: Run tests with Gradle
-        uses: eskatos/gradle-command-action@v1
-        with:
-          arguments: |
-            test 
-            --stacktrace 
-            -Pkotlin.version=${{ matrix.kotlin-version }} 
-            -Pkotlin.ir.enabled=${{ matrix.kotlin-ir-enabled }}
-            -PjavaToolchainTestVersion=${{ matrix.java-version }}
+        run: >
+          ./gradlew check
+          --stacktrace
+          -Pkotlin.version=${{ matrix.kotlin-version }}
+          -Pkotlin.ir.enabled=${{ matrix.kotlin-ir-enabled }}
+          -PjavaToolchainTestVersion=${{ matrix.java-version }}
 
   android-instrumented-tests:
     runs-on: macos-latest
@@ -67,17 +56,8 @@ jobs:
           distribution: adopt
           java-version: 11
 
-      - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
-
-      - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - name: AVD cache
         uses: actions/cache@v3
diff --git a/build.gradle.kts b/build.gradle.kts
index 40dbfc695..f9f150f00 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,13 @@ plugins {
 
 group = "io.mockk"
 
+apiValidation {
+    ignoredProjects += listOf(
+        projects.testModules.performanceTests.name,
+        projects.testModules.clientTests.name,
+    )
+}
+
 tasks.wrapper {
     gradleVersion = "7.5.1"
     distributionType = Wrapper.DistributionType.ALL