diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 1be9f607..bde917a0 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -27,12 +27,12 @@ jobs:
         with:
           path: |
             app/libs/libcore.aar
-          key: ${{ hashFiles('bin/lib/core/*', 'libcore_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/core/*', 'libcore_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17
+          go-version: 1.17.1
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run lib core
@@ -50,7 +50,7 @@ jobs:
         with:
           path: |
             plugin/trojan-go/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/trojan_go/*', 'trojan_go_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/trojan_go/*', 'trojan_go_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -106,7 +106,7 @@ jobs:
         with:
           path: |
             plugin/pingtunnel/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/pingtunnel/*', 'pt_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/pingtunnel/*', 'pt_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -129,7 +129,7 @@ jobs:
         with:
           path: |
             plugin/relaybaton/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/relaybaton/*', 'rb_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/relaybaton/*', 'rb_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -152,7 +152,7 @@ jobs:
         with:
           path: |
             plugin/brook/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/brook/*', 'brook_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/brook/*', 'brook_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -175,12 +175,12 @@ jobs:
         with:
           path: |
             plugin/hysteria/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/hysteria/*', 'hysteria_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/hysteria/*', 'hysteria_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.16
+          go-version: 1.17.1
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run plugin hysteria
@@ -198,12 +198,12 @@ jobs:
         with:
           path: |
             plugin/wireguard/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/wireguard/*', 'wireguard_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/wireguard/*', 'wireguard_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17
+          go-version: 1.17.1
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run plugin wireguard
@@ -290,7 +290,7 @@ jobs:
         with:
           path: |
             app/libs/libcore.aar
-          key: ${{ hashFiles('bin/lib/core/*', 'libcore_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/core/*', 'libcore_status') }}
       - name: Shadowsocks Cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b6f1bff3..fb33e215 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,12 +40,12 @@ jobs:
         with:
           path: |
             app/libs/libcore.aar
-          key: ${{ hashFiles('bin/lib/core/*', 'libcore_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/core/*', 'libcore_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17
+          go-version: 1.17.1
       - name: Gradle cache
         uses: actions/cache@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -143,7 +143,7 @@ jobs:
         with:
           path: |
             app/libs/libcore.aar
-          key: ${{ hashFiles('bin/lib/core/*', 'libcore_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/core/*', 'libcore_status') }}
       - name: Shadowsocks Cache
         uses: actions/cache@v2
         with:
@@ -266,7 +266,7 @@ jobs:
         with:
           path: |
             app/libs/libcore.aar
-          key: ${{ hashFiles('bin/lib/core/*', 'libcore_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/core/*', 'libcore_status') }}
       - name: Shadowsocks Cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release_brook.yml b/.github/workflows/release_brook.yml
index 27327914..57d32b4e 100644
--- a/.github/workflows/release_brook.yml
+++ b/.github/workflows/release_brook.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: |
             plugin/brook/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/brook/*', 'brook_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/brook/*', 'brook_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -69,7 +69,7 @@ jobs:
         with:
           path: |
             plugin/brook/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/brook/*', 'brook_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/brook/*', 'brook_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -177,7 +177,7 @@ jobs:
         with:
           path: |
             plugin/brook/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/brook/*', 'brook_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/brook/*', 'brook_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release_hysteria.yml b/.github/workflows/release_hysteria.yml
index b683bed6..ae777b28 100644
--- a/.github/workflows/release_hysteria.yml
+++ b/.github/workflows/release_hysteria.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: |
             plugin/hysteria/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/hysteria/*', 'hysteria_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/hysteria/*', 'hysteria_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.16
+          go-version: 1.17.1
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run plugin hysteria
@@ -69,7 +69,7 @@ jobs:
         with:
           path: |
             plugin/hysteria/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/hysteria/*', 'hysteria_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/hysteria/*', 'hysteria_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -177,7 +177,7 @@ jobs:
         with:
           path: |
             plugin/hysteria/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/hysteria/*', 'hysteria_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/hysteria/*', 'hysteria_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release_pingtunnel.yml b/.github/workflows/release_pingtunnel.yml
index 9ce8bcfc..90df8908 100644
--- a/.github/workflows/release_pingtunnel.yml
+++ b/.github/workflows/release_pingtunnel.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: |
             plugin/pingtunnel/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/pingtunnel/*', 'pt_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/pingtunnel/*', 'pt_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -64,7 +64,7 @@ jobs:
         with:
           path: |
             plugin/pingtunnel/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/pingtunnel/*', 'pt_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/pingtunnel/*', 'pt_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -172,7 +172,7 @@ jobs:
         with:
           path: |
             plugin/pingtunnel/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/pingtunnel/*', 'pt_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/pingtunnel/*', 'pt_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release_relaybaton.yml b/.github/workflows/release_relaybaton.yml
index d65af0c2..1ce75543 100644
--- a/.github/workflows/release_relaybaton.yml
+++ b/.github/workflows/release_relaybaton.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: |
             plugin/relaybaton/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/relaybaton/*', 'rb_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/relaybaton/*', 'rb_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -64,7 +64,7 @@ jobs:
         with:
           path: |
             plugin/relaybaton/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/relaybaton/*', 'rb_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/relaybaton/*', 'rb_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -172,7 +172,7 @@ jobs:
         with:
           path: |
             plugin/relaybaton/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/relaybaton/*', 'rb_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/relaybaton/*', 'rb_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release_trojan_go.yml b/.github/workflows/release_trojan_go.yml
index 58286299..9570d5ef 100644
--- a/.github/workflows/release_trojan_go.yml
+++ b/.github/workflows/release_trojan_go.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: |
             plugin/trojan-go/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/trojan_go/*', 'trojan_go_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/trojan_go/*', 'trojan_go_status') }}
       - name: Install Golang
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -64,7 +64,7 @@ jobs:
         with:
           path: |
             plugin/trojan-go/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/trojan_go/*', 'trojan_go_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/trojan_go/*', 'trojan_go_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -172,7 +172,7 @@ jobs:
         with:
           path: |
             plugin/trojan-go/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/trojan_go/*', 'trojan_go_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/trojan_go/*', 'trojan_go_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/release_wireguard.yml b/.github/workflows/release_wireguard.yml
index 72eb6314..c590d976 100644
--- a/.github/workflows/release_wireguard.yml
+++ b/.github/workflows/release_wireguard.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: |
             plugin/wireguard/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/wireguard/*', 'wireguard_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/wireguard/*', 'wireguard_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17
+          go-version: 1.17.1
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run plugin wireguard
@@ -69,7 +69,7 @@ jobs:
         with:
           path: |
             plugin/wireguard/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/wireguard/*', 'wireguard_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/wireguard/*', 'wireguard_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
@@ -177,7 +177,7 @@ jobs:
         with:
           path: |
             plugin/wireguard/src/main/jniLibs
-          key: ${{ hashFiles('bin/lib/wireguard/*', 'wireguard_status') }}
+          key: ${{ hashFiles('.github/workflows/*', 'bin/lib/wireguard/*', 'wireguard_status') }}
       - name: Gradle cache
         uses: actions/cache@v2
         with:
diff --git a/library/core b/library/core
index 72b98d93..f16ecd2a 160000
--- a/library/core
+++ b/library/core
@@ -1 +1 @@
-Subproject commit 72b98d93bbb74ae14dc991180ad825f5d834dc6b
+Subproject commit f16ecd2acf01d10934332c0a234fb2ed2cfc9726
diff --git a/sager.properties b/sager.properties
index 949d63c8..5d6a4969 100644
--- a/sager.properties
+++ b/sager.properties
@@ -20,8 +20,8 @@ BROOK_VERSION=2
 TROJAN_VERSION_NAME=1.16.0
 TROJAN_VERSION=1
 
-HYSTERIA_VERSION_NAME=0.8.5
-HYSTERIA_VERSION=3
+HYSTERIA_VERSION_NAME=0.8.5-1
+HYSTERIA_VERSION=4
 
 WIREGUARD_VERSION_NAME=20210424-3
 WIREGUARD_VERSION=4