Added cache for waypoint calculation #Performance