diff --git a/ControlElements/MHTextEditWidget.cs b/ControlElements/MHTextEditWidget.cs
index 5940d93bf..9e16ab7c4 100644
--- a/ControlElements/MHTextEditWidget.cs
+++ b/ControlElements/MHTextEditWidget.cs
@@ -84,6 +84,12 @@ namespace MatterHackers.MatterControl
 			get { return actuallTextEditWidget.InternalTextEditWidget.SelectAllOnFocus; }
 			set { actuallTextEditWidget.InternalTextEditWidget.SelectAllOnFocus = value; }
 		}
+
+		public void DrawFromHintedCache()
+		{
+			ActualTextEditWidget.Printer.DrawFromHintedCache = true;
+			ActualTextEditWidget.DoubleBuffer = false;
+		}
 	}
 
 	public class MHPasswordTextEditWidget : MHTextEditWidget
diff --git a/PrinterControls/EditMacrosWindow.cs b/PrinterControls/EditMacrosWindow.cs
index 35b045b70..a769a0f37 100644
--- a/PrinterControls/EditMacrosWindow.cs
+++ b/PrinterControls/EditMacrosWindow.cs
@@ -195,6 +195,7 @@ namespace MatterHackers.MatterControl
 			macroCommandLabel.Margin = new BorderDouble(0, 0, 0, 1);
 
 			macroCommandInput = new MHTextEditWidget(windowController.ActiveMacro.GCode, pixelHeight: 120, multiLine: true, typeFace: ApplicationController.MonoSpacedTypeFace);
+			macroCommandInput.DrawFromHintedCache();
 			macroCommandInput.HAnchor = HAnchor.ParentLeftRight;
 			macroCommandInput.VAnchor = VAnchor.ParentBottomTop;
 			macroCommandInput.ActualTextEditWidget.VAnchor = VAnchor.ParentBottomTop;
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index a1d946686..5ce091091 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -1234,6 +1234,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 								HAnchor = HAnchor.ParentLeftRight,
 							};
 
+							stringEdit.DrawFromHintedCache();
+
 							stringEdit.ActualTextEditWidget.EditComplete += (sender, e) =>
 							{
 								ActiveSliceSettings.Instance.SetValue(settingData.SlicerConfigName, ((TextEditWidget)sender).Text.Replace("\n", "\\n"), persistenceLayer);
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index a54600911..e37124015 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit a5460091153cc8a7862675fea54710f4b69f3341
+Subproject commit e37124015adc9c3458e207542e4ccc8d1ca6e0cc