diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index dbb0ca921..f15634a1f 100644
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -417,17 +417,15 @@ void FGRouteMgr::postinit()
 // then the global initial waypoint list could die.
   string_list *waypoints = globals->get_initial_waypoints();
   if (waypoints) {
-    string_list::iterator it;
-    for (it = waypoints->begin(); it != waypoints->end(); ++it) {
-        WayptRef w = waypointFromString(*it, -1);
+    for (const auto& wpStr : *waypoints) {
+        WayptRef w = waypointFromString(wpStr, -1);
         if (w) {
             _plan->insertWayptAtIndex(w, -1);
         } else {
-            SG_LOG(SG_AUTOPILOT, SG_WARN, "Failed to create waypoint from '" << *it << "'");
+            SG_LOG(SG_AUTOPILOT, SG_WARN, "Failed to create waypoint from '" << wpStr << "'");
         }
     }
     
-    SG_LOG(SG_AUTOPILOT, SG_INFO, "loaded initial waypoints:" << numLegs());
     update_mirror();
   }
 
@@ -538,8 +536,11 @@ void FGRouteMgr::update( double dt )
   }
   
   // use RoutePath to compute location of active WP
-  RoutePath path(_plan);
-  SGGeod wpPos = path.positionForIndex(_plan->currentIndex());
+  if (!_routePath) {
+    _routePath.reset(new RoutePath{_plan});
+  }
+
+  SGGeod wpPos = _routePath->positionForIndex(_plan->currentIndex());
   double courseDeg, az2, distanceM;
   SGGeodesy::inverse(currentPos, wpPos, courseDeg, az2, distanceM);
 
@@ -564,7 +565,7 @@ void FGRouteMgr::update( double dt )
   
   FlightPlan::Leg* nextLeg = _plan->nextLeg();
   if (nextLeg) {
-    wpPos = path.positionForIndex(_plan->currentIndex() + 1);
+    wpPos = _routePath->positionForIndex(_plan->currentIndex() + 1);
     SGGeodesy::inverse(currentPos, wpPos, courseDeg, az2, distanceM);
 
     wp1->setDoubleValue("dist", distanceM * SG_METER_TO_NM);
@@ -586,6 +587,7 @@ void FGRouteMgr::update( double dt )
 
 void FGRouteMgr::clearRoute()
 {
+  _routePath.reset();
   if (_plan) {
       _plan->clearLegs();
   }
@@ -670,6 +672,7 @@ void FGRouteMgr::waypointsChanged()
 // mirror internal route to the property system for inspection by other subsystems
 void FGRouteMgr::update_mirror()
 {
+    _routePath.reset(); // wipe this so we re-compute on next update()
   mirror->removeChildren("wp");
   NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
   FGDialog* rmDlg = gui ? gui->getDialog("route-manager") : NULL;
diff --git a/src/Autopilot/route_mgr.hxx b/src/Autopilot/route_mgr.hxx
index afe38a530..accc975ee 100644
--- a/src/Autopilot/route_mgr.hxx
+++ b/src/Autopilot/route_mgr.hxx
@@ -21,8 +21,7 @@
 // $Id$
 
 
-#ifndef _ROUTE_MGR_HXX
-#define _ROUTE_MGR_HXX 1
+#pragma once
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -32,6 +31,7 @@
 // forward decls
 class SGPath;
 class PropertyWatcher;
+class RoutePath;
 
 /**
  * Top level route manager class
@@ -181,6 +181,8 @@ private:
     InputListener *listener;
     SGPropertyNode_ptr mirror;
 
+    std::unique_ptr<RoutePath> _routePath;
+
     /**
      * Helper to keep various pieces of state in sync when the route is
      * modified (waypoints added, inserted, removed). Notably, this fires the
@@ -236,4 +238,3 @@ private:
     void setAlternate(const std::string &icao);
 };
 
-#endif // _ROUTE_MGR_HXX