2 files changed, 4 insertions, 10 deletions
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index a760819d6..4f8c348bb 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -548,7 +548,7 @@ namespace MediaBrowser.Api.Images
 
             var contentType = GetMimeType(request.Format, imageInfo.Path);
 
-            var cacheGuid = new Guid(_imageProcessor.GetImageCacheTag(item, request.Type, imageInfo.Path, originalFileImageDateModified, supportedImageEnhancers));
+            var cacheGuid = new Guid(_imageProcessor.GetImageCacheTag(item, imageInfo, supportedImageEnhancers));
 
             TimeSpan? cacheDuration = null;
 
@@ -571,9 +571,8 @@ namespace MediaBrowser.Api.Images
             {
                 Item = currentItem,
                 Request = currentRequest,
-                OriginalImageDateModified = originalFileImageDateModified,
                 Enhancers = supportedImageEnhancers,
-                OriginalImagePath = imageInfo.Path,
+                Image = imageInfo,
                 ImageProcessor = _imageProcessor
 
             }, contentType, responseHeaders);
diff --git a/MediaBrowser.Api/Images/ImageWriter.cs b/MediaBrowser.Api/Images/ImageWriter.cs
index 2f161709a..b6638d9df 100644
--- a/MediaBrowser.Api/Images/ImageWriter.cs
+++ b/MediaBrowser.Api/Images/ImageWriter.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using ServiceStack.Web;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -30,9 +29,7 @@ namespace MediaBrowser.Api.Images
         /// <summary>
         /// The original image date modified
         /// </summary>
-        public DateTime OriginalImageDateModified;
-
-        public string OriginalImagePath;
+        public ItemImageInfo Image;
 
         public IImageProcessor ImageProcessor { get; set; }
 
@@ -80,12 +77,10 @@ namespace MediaBrowser.Api.Images
                 Enhancers = Enhancers,
                 Height = Request.Height,
                 ImageIndex = Request.Index ?? 0,
-                ImageType = Request.Type,
+                Image = Image,
                 Item = Item,
                 MaxHeight = Request.MaxHeight,
                 MaxWidth = Request.MaxWidth,
-                OriginalImageDateModified = OriginalImageDateModified,
-                OriginalImagePath = OriginalImagePath,
                 Quality = Request.Quality,
                 Width = Request.Width,
                 OutputFormat = Request.Format,