diff --git a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
index 4f9f1ab215..5ffff0d5c0 100644
--- a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
+++ b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
@@ -564,7 +564,9 @@ class WorkerAutomation(
                 }
             }
         }
-
+        // A better tile than this unit can build might have been stored in the cache
+        if (!rank.repairImprovment!! && (rank.bestImprovement == null || 
+                !unit.canBuildImprovement(rank.bestImprovement!!, tile))) return -100f
         return rank.improvementPriority!!
     }