diff --git a/buildSrc/src/main/groovy/root.gradle b/buildSrc/src/main/groovy/root.gradle
index ff8640365..4f34000fc 100644
--- a/buildSrc/src/main/groovy/root.gradle
+++ b/buildSrc/src/main/groovy/root.gradle
@@ -46,3 +46,11 @@ def writePreprocessorDefinitions() {
 writePreprocessorDefinitions()
 
 // Wire JVMDowngrader to process remapped jars
+gradle.projectsEvaluated {
+    rootProject.subprojects.each {
+        if (it.tasks.findByName('remapJar') == null) return
+        it.tasks.downgradeJar.inputFile = it.tasks.remapJar.archiveFile
+        it.tasks.jar.finalizedBy(it.tasks.remapJar)
+        it.tasks.remapJar.finalizedBy(it.tasks.shadeDowngradedApi)
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 884dc5c84..1287140ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # Gradle stuff
 org.gradle.jvmargs=-Xmx4096M
-org.gradle.parallel=false
-org.gradle.caching=false
+org.gradle.parallel=true
+org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons