diff --git a/gradle.properties b/gradle.properties
index 10ff2e365..b57dc01ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ org.gradle.configureondemand=false
 org.gradle.caching=true
 
 # Enable configuration caching between builds.
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
@@ -35,9 +35,6 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 
 # Disable build features that are enabled by default,
-# https://developer.android.com/studio/releases/gradle-plugin#buildFeatures
-android.defaults.buildfeatures.buildconfig=false
-android.defaults.buildfeatures.aidl=false
-android.defaults.buildfeatures.renderscript=false
+# https://developer.android.com/build/releases/gradle-plugin#default-changes
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false