diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ca74bdfb1..306e07b85d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ cache_keys: &cache_keys
 parameters:
   gradle_flags:
     type: string
-    default: "--build-cache --parallel --stacktrace --no-daemon"
+    default: "--stacktrace --no-daemon"
 
 jobs:
   build:
diff --git a/gradle.properties b/gradle.properties
index 17d571dbf0..2d7e4173b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,4 @@
+org.gradle.parallel=true
+org.gradle.caching=true
+
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g