diff --git a/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenPlugin.java b/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenPlugin.java
index 126de15b78..c66fe4c49e 100644
--- a/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenPlugin.java
+++ b/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenPlugin.java
@@ -94,7 +94,6 @@ public class CodegenPlugin implements Plugin<Project> {
 
             task.setDescription("jOOQ code generation" + (configuration.unnamed ? " for all executions" : " for the " + configuration.name + " execution"));
             task.setGroup("jOOQ");
-            task.doFirst(CodegenTask::registerSourceSet);
         };
     }
 }
diff --git a/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenTask.java b/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenTask.java
index 1c8232aace..5af6ff6072 100644
--- a/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenTask.java
+++ b/jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/CodegenTask.java
@@ -94,7 +94,7 @@ public class CodegenTask extends DefaultTask {
 
         // [#16318] When the task is up-to-date, we still have to register our source set contributions, which
         //          apparently aren't being cached by gradle's build cache.
-        getOutputs().upToDateWhen(task -> upToDate(task) && registerSourceSet(task));
+        getOutputs().upToDateWhen(task -> registerSourceSet(task) && upToDate(task));
     }
 
     static boolean registerSourceSet(Task t) {