diff --git a/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt b/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt
index 26808a0f43..8ef6d550f7 100644
--- a/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt
+++ b/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt
@@ -44,7 +44,8 @@ class UnitMovement(val unit: MapUnit) {
         // If I can't move my only option is to stay...
         if (unitMovement == 0f || unit.cache.cannotMove) return distanceToTiles
         // If our escort can't move, ditto
-        if (includeOtherEscortUnit && unit.getOtherEscortUnit()?.currentMovement == 0f) return distanceToTiles
+        if (includeOtherEscortUnit && unit.isEscorting()
+            && unit.getOtherEscortUnit()?.currentMovement == 0f) return distanceToTiles
 
         var tilesToCheck = listOf(unitTile)
 
@@ -703,10 +704,10 @@ class UnitMovement(val unit: MapUnit) {
         movementCostCache: HashMap<Pair<Tile, Tile>, Float> = HashMap(),
         includeOtherEscortUnit: Boolean = true
     ): PathsToTilesWithinTurn {
-        val cacheResults = pathfindingCache.getDistanceToTiles(considerZoneOfControl)
-        if (cacheResults != null) {
-            return cacheResults
-        }
+//        val cacheResults = pathfindingCache.getDistanceToTiles(considerZoneOfControl)
+//        if (cacheResults != null) {
+//            return cacheResults
+//        }
         val distanceToTiles = getDistanceToTilesAtPosition(
             unit.currentTile.position,
             unit.currentMovement,