diff --git a/processor/src/main/java/google/registry/processors/VKeyProcessor.java b/processor/src/main/java/google/registry/processors/VKeyProcessor.java
index 2967b13c5..b4ecf0d60 100644
--- a/processor/src/main/java/google/registry/processors/VKeyProcessor.java
+++ b/processor/src/main/java/google/registry/processors/VKeyProcessor.java
@@ -105,6 +105,7 @@ public class VKeyProcessor extends AbstractProcessor {
                       }
                       try {
                         createJavaFile(
+                                annotatedTypeElement,
                                 getPackageName(annotatedTypeElement),
                                 String.format(CONVERTER_CLASS_NAME_TEMP, simpleTypeName),
                                 TypeName.get(entityType),
@@ -118,7 +119,11 @@ public class VKeyProcessor extends AbstractProcessor {
   }
 
   private static JavaFile createJavaFile(
-      String packageName, String converterClassName, TypeName entityType, TypeName keyType) {
+      TypeElement annotatedTypeElement,
+      String packageName,
+      String converterClassName,
+      TypeName entityType,
+      TypeName keyType) {
     ParameterizedTypeName attributeConverter =
         ParameterizedTypeName.get(
             ClassName.get("google.registry.persistence.converter", "VKeyConverter"),
@@ -143,6 +148,7 @@ public class VKeyProcessor extends AbstractProcessor {
 
     TypeSpec.Builder classBuilder =
         TypeSpec.classBuilder(converterClassName)
+            .addOriginatingElement(annotatedTypeElement)
             .addAnnotation(AnnotationSpec.builder(ClassName.get(Converter.class)).build())
             .addModifiers(Modifier.FINAL, Modifier.PUBLIC)
             .superclass(attributeConverter)
diff --git a/processor/src/main/resources/META-INF/gradle/incremental.annotation.processors b/processor/src/main/resources/META-INF/gradle/incremental.annotation.processors
new file mode 100644
index 000000000..bf79f5bfa
--- /dev/null
+++ b/processor/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+google.registry.processors.VKeyProcessor,ISOLATING