Change to use same PathFinder instance for all pahtfindings