diff --git a/Jenkinsfile b/Jenkinsfile
index fe4e64d1e..0ddd57776 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,44 +18,44 @@ pipeline {
             }
         }
         stage('buildandtest') {
-            cache(maxCacheSize: 250/*MB*/, caches: [
-                [$class: 'ArbitraryFileCache', excludes: 'log.txt', includes: '**/*', path: '${WORKSPACE}/projects/forge/build/extractRangeMap'] //Cache the rangemap to help speed up builds
-            ]){
-                steps {
+            steps {
+                cache(maxCacheSize: 250/*MB*/, caches: [
+                    [$class: 'ArbitraryFileCache', excludes: 'log.txt', includes: '**/*', path: '${WORKSPACE}/projects/forge/build/extractRangeMap'] //Cache the rangemap to help speed up builds
+                ]){
                     sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue build test'
-                    script {
-                        env.MYVERSION = sh(returnStdout: true, script: './gradlew properties -q | grep "version:" | awk \'{print $2}\'').trim()
-                    }
                 }
-                post {
-                    success {
-                        writeChangelog(currentBuild, 'build/changelog.txt')
-                        archiveArtifacts artifacts: 'build/changelog.txt', fingerprint: false
-                    }
+                script {
+                    env.MYVERSION = sh(returnStdout: true, script: './gradlew properties -q | grep "version:" | awk \'{print $2}\'').trim()
+                }
+            }
+            post {
+                success {
+                    writeChangelog(currentBuild, 'build/changelog.txt')
+                    archiveArtifacts artifacts: 'build/changelog.txt', fingerprint: false
                 }
             }
         }
         stage('publish') {
-            cache(maxCacheSize: 250/*MB*/, caches: [
-                [$class: 'ArbitraryFileCache', excludes: 'log.txt', includes: '**/*', path: '${WORKSPACE}/projects/forge/build/extractRangeMap'] //Cache the rangemap to help speed up builds
-            ]){
-                when {
-                    not {
-                        changeRequest()
-                    }
+            when {
+                not {
+                    changeRequest()
                 }
-                environment {
-                    FORGE_MAVEN = credentials('forge-maven-forge-user')
-                    CROWDIN = credentials('forge-crowdin')
-                    KEYSTORE = credentials('forge-jenkins-keystore-old')
-                    KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
-                    KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
-                }
-                steps {
+            }
+            environment {
+                FORGE_MAVEN = credentials('forge-maven-forge-user')
+                CROWDIN = credentials('forge-crowdin')
+                KEYSTORE = credentials('forge-jenkins-keystore-old')
+                KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
+                KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
+            }
+            steps {
+                cache(maxCacheSize: 250/*MB*/, caches: [
+                    [$class: 'ArbitraryFileCache', excludes: 'log.txt', includes: '**/*', path: '${WORKSPACE}/projects/forge/build/extractRangeMap'] //Cache the rangemap to help speed up builds
+                ]){
                     sh './gradlew ${GRADLE_ARGS} forge:publish -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW} -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
-                    //We're testing so use the test group
-                    sh 'curl --user ${FORGE_MAVEN} http://files.minecraftforge.net/maven/manage/promote/latest/net.minecraftforge.test.forge/${MYVERSION}'
                 }
+                //We're testing so use the test group
+                sh 'curl --user ${FORGE_MAVEN} http://files.minecraftforge.net/maven/manage/promote/latest/net.minecraftforge.test.forge/${MYVERSION}'
             }
         }
     }