diff --git a/build.gradle b/build.gradle
index 627d7b5c1..fd9abf7c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,28 +65,11 @@ allprojects {
     }
 }
 
-tasks.register('writeVersion') {
-    def propsFile = file("$projectDir/app/common/src/main/resources/version.properties")
-    def propsDir = propsFile.parentFile
-
-    doLast {
-        if (propsDir.exists()) {
-            if (propsFile.exists()) {
-                println "File exists: $propsFile"
-            } else {
-                println "$propsFile does not exist. Creating file."
-                propsFile.createNewFile()
-            }
-        } else {
-            println "Creating directory: $propsDir"
-            propsDir.mkdirs()
-            propsFile.createNewFile()
-        }
-
-        def props = new Properties()
-        props.setProperty("version", version)
-        props.store(propsFile.newWriter(), null)
-    }
+tasks.register('writeVersion', WriteProperties) {
+    outputFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
+    println "Writing version.properties to ${outputFile.path}"
+    comment "${new Date()}"
+    property 'version', project.provider { project.version.toString() }
 }
 
 tasks.named('createExe') {
diff --git a/gradle.properties b/gradle.properties
index 9184cf5c6..8a390f592 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,7 @@
 org.gradle.parallel=true
 
 # Enables build caching to reuse outputs from previous builds for faster execution
-# org.gradle.caching=true
+org.gradle.caching=true
 
 org.gradle.build-scan=true
+# org.gradle.configuration-cache=true