diff --git a/build.gradle b/build.gradle
index 7ac4ca5c39..618469a626 100644
--- a/build.gradle
+++ b/build.gradle
@@ -509,7 +509,6 @@ project.tasks.register("showDiscrepancies", ShowDiscrepancies) {
     task ->
         task.group = "Help"
         task.description = "Report external dependencies that have more than one version referenced in the modules in this build"
-        task.notCompatibleWithConfigurationCache("Walks the project tree")
 }
 
 project.tasks.register('getModulesManifest', DefaultTask) {
diff --git a/gradle.properties b/gradle.properties
index 7132712cba..02fb930a25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,10 @@ org.gradle.vfs.watch=true
 # This controls Gradle's build cache, which improves efficiency.
 # https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true
+# This controls Gradle's configuration cache, which improves efficiency.
+# https://docs.gradle.org/current/userguide/configuration_cache.html
+#org.gradle.configuration-cache=true
+#org.gradle.configuration-cache.problems=warn
 # comment out or use --no-parallel to turn off parallel execution
 org.gradle.parallel=true
 # comment out and Gradle will attempt to determine the optimal number of executor threads to use
@@ -56,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
 # The current version numbers for the gradle plugins.
 artifactoryPluginVersion=6.0.4
 gradleNodePluginVersion=7.1.0
-gradlePluginsVersion=11.0.0
+gradlePluginsVersion=11.1.0-teamCityProps-SNAPSHOT
 owaspDependencyCheckPluginVersion=13.0.0
 
 # Versions of node and npm to use during the build. If set, these versions
diff --git a/server/build.gradle b/server/build.gradle
index f833e42194..4271d25c9f 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -5,6 +5,7 @@ import org.labkey.gradle.task.CreateJsDocs
 import org.labkey.gradle.util.BuildUtils
 import org.labkey.gradle.util.GroupNames
 import org.labkey.gradle.util.PomFileHelper
+import org.labkey.gradle.plugin.extension.TeamCityExtension
 
 plugins {
     id 'maven-publish'
@@ -193,7 +194,7 @@ project.tasks.register("reportVersionToTeamCity", DefaultTask) {
         })
 }
 
-if (project.hasProperty("teamcity"))
+if (TeamCityExtension.isOnTeamCity(project))
 {
     project.tasks.named('stageApp').configure { dependsOn(project.tasks.named('reportVersionToTeamCity')) }
 }