diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47a614f..8f99cc1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@
 # against bad commits.
 
 name: build
-on: [pull_request, push]
+on: [ pull_request, push ]
 
 jobs:
   build:
@@ -16,8 +16,12 @@ jobs:
           java-version: 16
       - uses: actions/cache@v2
         with:
-          path: ~/.gradle/
-          key: ${{ runner.os }}-via-cache
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: build
         env:
           CURSEFORGE_API_KEY: ${{ secrets.CREEPER_CF }}
diff --git a/build.gradle b/build.gradle
index b06d9c0..1889a56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
 // todo migrate this code to kotlin
+
+import net.fabricmc.loom.task.RemapJarTask
 import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
@@ -20,7 +22,7 @@ plugins {
 }
 
 def ENV = System.getenv()
-def vvVer = "4.0.2-SNAPSHOT"
+def vvVer = "4.1.0-21w37a-SNAPSHOT"
 def yamlVer = "1.29"
 
 description = "Client-side and server-side ViaVersion implementation for Fabric"
@@ -57,6 +59,7 @@ allprojects {
     }
 
     group = "com.viaversion.fabric"
+    version = rootProject.version
 
     configurations {
         dev
@@ -88,8 +91,8 @@ allprojects {
 
     afterEvaluate {
         remapJar {
-            input = file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar")
-            archiveFileName = "${archivesBaseName}-${version}.jar"
+            input = file("${project.buildDir}/libs/$archivesBaseName-${archiveVersion.get()}-dev.jar")
+            archiveFileName = "${archivesBaseName}-${archiveVersion.get()}.jar"
         }
 
         artifacts {
@@ -144,7 +147,7 @@ subprojects {
     }
 }
 
-task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) {
+task remapMavenJar(type: RemapJarTask, dependsOn: jar) {
     afterEvaluate {
         input = file("${project.buildDir}/libs/${archivesBaseName}-${version}-dev.jar")
         archiveFileName = "${archivesBaseName}-${version}-maven.jar"
diff --git a/viafabric-mc114/build.gradle.kts b/viafabric-mc114/build.gradle.kts
index 9a16bb1..065a98a 100644
--- a/viafabric-mc114/build.gradle.kts
+++ b/viafabric-mc114/build.gradle.kts
@@ -1,5 +1,3 @@
-version = rootProject.version
-
 dependencies {
     minecraft("com.mojang:minecraft:1.14.4")
     mappings("net.fabricmc:yarn:1.14.4+build.18:v2")
diff --git a/viafabric-mc115/build.gradle.kts b/viafabric-mc115/build.gradle.kts
index 201fdb7..b522f04 100644
--- a/viafabric-mc115/build.gradle.kts
+++ b/viafabric-mc115/build.gradle.kts
@@ -1,5 +1,3 @@
-version = rootProject.version
-
 dependencies {
     minecraft("com.mojang:minecraft:1.15.2")
     mappings("net.fabricmc:yarn:1.15.2+build.17:v2")
diff --git a/viafabric-mc116/build.gradle.kts b/viafabric-mc116/build.gradle.kts
index b1b0b65..3918401 100644
--- a/viafabric-mc116/build.gradle.kts
+++ b/viafabric-mc116/build.gradle.kts
@@ -1,5 +1,3 @@
-version = rootProject.version
-
 dependencies {
     minecraft("com.mojang:minecraft:1.16.5")
     mappings("net.fabricmc:yarn:1.16.5+build.10:v2")
diff --git a/viafabric-mc117/build.gradle.kts b/viafabric-mc117/build.gradle.kts
index 6b78427..09c2993 100644
--- a/viafabric-mc117/build.gradle.kts
+++ b/viafabric-mc117/build.gradle.kts
@@ -1,5 +1,3 @@
-version = rootProject.version
-
 dependencies {
     minecraft("com.mojang:minecraft:1.17.1")
     mappings("net.fabricmc:yarn:1.17.1+build.61:v2")
diff --git a/viafabric-mc118/build.gradle.kts b/viafabric-mc118/build.gradle.kts
index c53aecb..a467539 100644
--- a/viafabric-mc118/build.gradle.kts
+++ b/viafabric-mc118/build.gradle.kts
@@ -1,8 +1,6 @@
-version = rootProject.version
-
 dependencies {
-    minecraft("com.mojang:minecraft:1.18_experimental-snapshot-7")
-    mappings("net.fabricmc:yarn:1.18_experimental-snapshot-7+build.4:v2")
+    minecraft("com.mojang:minecraft:21w37a")
+    mappings("net.fabricmc:yarn:21w37a+build.10:v2")
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:0.40.1+1.18_experimental")
     modImplementation("com.terraformersmc:modmenu:2.0.2")
diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts
index 137747d..8cb5567 100644
--- a/viafabric-mc18/build.gradle.kts
+++ b/viafabric-mc18/build.gradle.kts
@@ -1,5 +1,3 @@
-version = rootProject.version
-
 dependencies {
 	minecraft("com.mojang:minecraft:1.8.9")
 	mappings("net.fabricmc:yarn:1.8.9+build.202107080308:v2")