diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bdb5e2..a702f6c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     # cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
-
+    timeout-minutes: 90
     steps:
     - uses: actions/checkout@v2
       with:
@@ -26,42 +26,33 @@ jobs:
     - name: Install dependencies
       run: |
           uname -a
-          # sudo apt-fast update
           sudo apt-fast install -y autoconf-archive bison libunwind-dev libfl-dev ninja-build libtool curl gcc-10 g++-10
           sudo apt-fast install -y libboost-all-dev libxml2-dev zip ccache
           cmake --version
           mkdir -p ${{github.workspace}}/build
-    - name: Cache build dependencies
-      id: cache-deps
-      uses: actions/cache@v2
-      with:
-        path: |
-          ${{github.workspace}}/build/_deps
-          ${{github.workspace}}/build/third_party
-        key: ${{ runner.os }}-builddeps
     - name: Cache ccache
       id: cache-ccache
       uses: actions/cache@v2
       with:
         path: |
           ~/.ccache
-        key: ${{ runner.os }}-ccache
+        key: ${{ runner.os }}-ccache-${{ github.sha }}
+        restore-keys: ${{ runner.os }}-ccache-
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: |
           cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cd ${{github.workspace}}/build           
+          cd ${{github.workspace}}/build
       env:
         CC: gcc-10
         CXX: g++-10
     - name: Build & Test
       working-directory: ${{github.workspace}}/build
-      run: |      
+      run: |
           ninja core/all server/all
           ccache --show-stats
           # GLOG_logtostderr=1 ctest -V -R list_family_test
           echo Run ctest -V -L DFLY
           GLOG_logtostderr=1 GLOG_vmodule=transaction=1,engine_shard_set=1 ctest -V -L DFLY
           GLOG_logtostderr=1 GLOG_vmodule=transaction=1,engine_shard_set=1 CTEST_OUTPUT_ON_FAILURE=1 ninja server/test
-                    
\ No newline at end of file