diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
index 38b686c76ab..f50dd2b6e46 100644
--- a/dd-java-agent/build.gradle
+++ b/dd-java-agent/build.gradle
@@ -347,8 +347,11 @@ def generateAgentJarIndex = tasks.register('generateAgentJarIndex', JavaExec) {
   it.mainClass = 'datadog.trace.bootstrap.AgentJarIndex$IndexGenerator'
 
   it.inputs.files(includedJarFileTree)
-  it.inputs.files(it.classpath)
+    .withPropertyName("includedAgentFiles")
+    .withPathSensitivity(PathSensitivity.RELATIVE)
   it.outputs.dir(destinationDir)
+    .withPropertyName("agentJarIndex")
+  it.outputs.cacheIf { true }
   it.classpath = objects.fileCollection().tap {
     it.from(project.configurations.named("shadowInclude"))
     it.from(project.configurations.named('slf4j-simple'))
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
index a3e8ddc83c4..644a5dcd58c 100644
--- a/dd-java-agent/instrumentation/build.gradle
+++ b/dd-java-agent/instrumentation/build.gradle
@@ -153,8 +153,9 @@ TaskProvider<JavaExec> registerIndexTask(String indexTaskName, String indexer, S
       it.from(project.configurations.named("runtimeClasspath"))
       it.from(project.configurations.named('slf4j-simple'))
     }
-    it.inputs.files(it.classpath)
     it.outputs.dir(destinationDir)
+      .withPropertyName("indexDirectory")
+    it.outputs.cacheIf { true }
     it.argumentProviders.add(new CommandLineArgumentProvider() {
         @Override
         Iterable<String> asArguments() {