Added unit caching for performance and more patrols