diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
index d05b612a9..93a4aa113 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
@@ -39,6 +39,7 @@ namespace mapcontrol
         this->setZValue(4);
         coord=internals::PointLatLng(50,50);
         RefreshToolTip();
+        setCacheMode(QGraphicsItem::DeviceCoordinateCache);
     }
 
     void HomeItem::RefreshToolTip()
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
index 494482283..7cabdff56 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
@@ -44,6 +44,8 @@ namespace mapcontrol
         connect(core,SIGNAL(OnNeedInvalidation()),this,SLOT(Core_OnNeedInvalidation()));
         connect(core,SIGNAL(OnMapDrag()),this,SLOT(ChildPosRefresh()));
         connect(core,SIGNAL(OnMapZoomChanged()),this,SLOT(ChildPosRefresh()));
+        setCacheMode(QGraphicsItem::ItemCoordinateCache);
+
         //resize();
     }
 
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
index dbbad253a..b1ee0d1e2 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
@@ -50,7 +50,6 @@ namespace mapcontrol
         mapfollowtype=UAVMapFollowType::None;
         trailtype=UAVTrailType::ByDistance;
         timer.start();
-//        setCacheMode(QGraphicsItem::ItemCoordinateCache);
     }
     UAVItem::~UAVItem()
     {