diff --git a/.github/runner-files/checksum.sh b/.github/runner-files/checksum.sh
deleted file mode 100755
index e3dcd6db83..0000000000
--- a/.github/runner-files/checksum.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-RESULT_FILE=$1
-
-if [ -f $RESULT_FILE ]; then
-  rm $RESULT_FILE
-fi
-touch $RESULT_FILE
-
-checksum_file() {
-  echo $(openssl md5 $1 | awk '{print $2}')
-}
-
-FILES=()
-while read -r -d ''; do
-  FILES+=("$REPLY")
-done < <(find . -type f \( -name "build.gradle*" -o -name "Dependencies.kt" -o -name "gradle-wrapper.properties" \) -print0)
-
-# Loop through files and append MD5 to result file
-for FILE in ${FILES[@]}; do
-  echo $(checksum_file $FILE) >> $RESULT_FILE
-done
-# Now sort the file so that it is 
-sort $RESULT_FILE -o $RESULT_FILE
\ No newline at end of file
diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
index bc647387fb..0046c971ef 100644
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@@ -38,18 +38,10 @@ jobs:
           mkdir -p ~/.gradle
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Generate Gradle cache key
-        run: ./.github/runner-files/checksum.sh checksum.txt
-
-      - name: Cache Gradle dependencies
-        uses: actions/cache@v2
-        continue-on-error: true # continue if the cache restore/upload fails
-        with:
-          path: |
-            ~/.gradle/caches/build-cache-*
-            ~/.gradle/caches/jars-*
-            ~/.gradle/caches/modules-*
-          key: ${{ runner.os }}-gradle-${{ hashFiles('checksum.txt') }}
-
       - name: Build app
-        run: ./gradlew assembleStandardDebug
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: assembleStandardDebug
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true