Merge branch '2.3.x'

Closes gh-22727

build.gradle

@@ -26,6 +26,6 @@ allprojects {
 	}
 
 	configurations.all {
-		resolutionStrategy.cacheChangingModulesFor 60, "minutes"
+		resolutionStrategy.cacheChangingModulesFor 0, "minutes"
 	}
 }