diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml
index ec2e3992d..62fb2a69e 100644
--- a/.github/workflows/build-installer.yml
+++ b/.github/workflows/build-installer.yml
@@ -30,7 +30,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build
-        run: .\gradlew.bat jpackage --no-configuration-cache
+        run: .\gradlew.bat jpackage
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -60,7 +60,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build
-        run: ./gradlew jpackage --no-configuration-cache
+        run: ./gradlew jpackage
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
diff --git a/app/build.gradle b/app/build.gradle
index b922a5a17..d8575e7ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,6 +94,7 @@ tasks.register('copyInstaller', Copy) {
     doNotTrackState("Copying installation file need to re-run every time")
 }
 
+// needed to avoid duplicate jars in 'libs' when changing versions
 tasks.register('deleteLibs', Delete) {
     delete "${project.buildDir}/${project.libsDirName}/"
 }
@@ -103,8 +104,14 @@ bootBuildImage {
     imageName = "zapek/${rootProject.name.toLowerCase(Locale.ROOT)}:${project.version}"
 }
 
+// This is needed to have jpackage work with the configuration cache, see https://github.com/petr-panteleyev/jpackage-gradle-plugin/issues/29
+def jpackageWorkdir = layout.buildDirectory.file('jpackage')
+tasks.register('cleanJpackageWorkdir', Delete) {
+    delete jpackageWorkdir
+}
+
 jpackage {
-    dependsOn "deleteLibs" // needed to avoid duplicate jars in 'libs' when changing versions
+    dependsOn deleteLibs, cleanJpackageWorkdir
     mustRunAfter "deleteLibs"
     dependsOn "bootJar"
     dependsOn "copyInstaller"
diff --git a/build.gradle b/build.gradle
index cf106f3ae..ea04aac10 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ plugins {
 
 // To upgrade Gradle, change the version here, refresh, then run the 'build setup/wrapper' task
 wrapper {
-    gradleVersion = '8.9'
+    gradleVersion = '8.10'
 }
 
 subprojects {
diff --git a/gradle.properties b/gradle.properties
index b2faf004a..a61adacb5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,6 +17,6 @@
 # along with Xeres.  If not, see <http://www.gnu.org/licenses/>.
 #
 org.gradle.parallel=true
-org.gradle.configuration-cache=false
+org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.gradle.configureondemand=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e5..9355b4155 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index b740cf133..f5feea6d6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e46..9b42019c7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################