Fix Caching Issue for Batch Operations
There is an issue with the cache key for batched operations. The
distance can change based on the avoidance. The avoidance setting
needs to be included in the cache key, otherwise the value can be
incorrect at times.