diff --git a/build.gradle.kts b/build.gradle.kts
index f46be600cf..f6468a33ba 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,6 +17,7 @@ buildscript {
 }
 
 plugins {
+    id("com.google.devtools.ksp") version("1.9.24-1.0.20") apply false
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
     id("com.android.library") apply false
     id("org.jetbrains.kotlin.android") apply false
diff --git a/embrace-android-payload/build.gradle.kts b/embrace-android-payload/build.gradle.kts
index 695b602c82..731d84bee3 100644
--- a/embrace-android-payload/build.gradle.kts
+++ b/embrace-android-payload/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("embrace-defaults")
-    id("org.jetbrains.kotlin.kapt")
+    id("com.google.devtools.ksp")
 }
 
 description = "Embrace Android SDK: Payload"
@@ -13,5 +13,5 @@ apiValidation.validationDisabled = true
 
 dependencies {
     implementation(libs.moshi)
-    kapt(libs.moshi.kotlin.codegen)
+    ksp(libs.moshi.kotlin.codegen)
 }
diff --git a/embrace-android-sdk/build.gradle.kts b/embrace-android-sdk/build.gradle.kts
index 86364a4215..3292eda510 100644
--- a/embrace-android-sdk/build.gradle.kts
+++ b/embrace-android-sdk/build.gradle.kts
@@ -2,7 +2,7 @@ import io.embrace.gradle.Versions
 
 plugins {
     id("embrace-defaults")
-    id("org.jetbrains.kotlin.kapt")
+    id("com.google.devtools.ksp")
 }
 
 description = "Embrace Android SDK: Core"
@@ -74,7 +74,7 @@ dependencies {
 
     // json
     implementation(libs.moshi)
-    kapt(libs.moshi.kotlin.codegen)
+    ksp(libs.moshi.kotlin.codegen)
 
     implementation(libs.opentelemetry.api)
     implementation(libs.opentelemetry.sdk)
diff --git a/gradle.properties b/gradle.properties
index 26e97a2ab9..6ced37aead 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,3 +23,6 @@ android.experimental.enableArtProfiles=true
 android.defaults.buildfeatures.buildconfig = false
 
 org.gradle.caching=true
+
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.problems=fail