diff --git a/gradle.properties b/gradle.properties
index 87c9723c73..d897e7c249 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,7 @@ org.gradle.jvmargs=-Xmx5120m
 org.gradle.parallel=true
 
 org.gradle.caching=true
+org.gradle.unsafe.configuration-cache=true
 
 # AndroidX support
 android.useAndroidX=true
diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml
index c24e6a3c42..ec9184415e 100644
--- a/gradle/androidx.versions.toml
+++ b/gradle/androidx.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp_version = "7.3.1"
+agp_version = "7.4.0"
 lifecycle_version = "2.5.1"
 
 [libraries]