diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/GIFAnimationProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/GIFAnimationProvider.cs
index 816e2fd..eceb5aa 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/GIFAnimationProvider.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/GIFAnimationProvider.cs
@@ -20,8 +20,6 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using QuickLook.ExtensionMethods;
-using QuickLook.Helpers;
 
 namespace QuickLook.Plugin.ImageViewer.AnimatedImage
 {
@@ -31,7 +29,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage
         {
             var decoder =
                 new GifBitmapDecoder(new Uri(path), BitmapCreateOptions.PreservePixelFormat,
-                    BitmapCacheOption.Default);
+                    BitmapCacheOption.OnLoad);
 
             var clock = TimeSpan.Zero;
             BitmapSource prevFrame = null;
diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.xaml.cs
index c77452d..e4135a6 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.xaml.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.xaml.cs
@@ -85,9 +85,12 @@ namespace QuickLook.Plugin.TextViewer
                 s.Read(buffer, 0, bufferLength);
 
                 viewer.Encoding = CharsetDetector.DetectFromBytes(buffer).Detected?.Encoding ?? Encoding.Default;
+
+                s.Position = 0;
+                viewer.Load(s);
             }
 
-            viewer.Load(path);
+            //viewer.Load(path);
             viewer.SyntaxHighlighting = HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(path));
         }
     }