diff --git a/AsyncDisplayKit/ASMultiplexImageNode.mm b/AsyncDisplayKit/ASMultiplexImageNode.mm
index 8215ece244..5c40590648 100644
--- a/AsyncDisplayKit/ASMultiplexImageNode.mm
+++ b/AsyncDisplayKit/ASMultiplexImageNode.mm
@@ -456,12 +456,16 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
 
 - (void)_updateProgressImageBlockOnDownloaderIfNeeded
 {
+	// Read our interface state so that we don't lock super while holding our lock.
+	ASInterfaceState interfaceState = self.interfaceState;
+    ASDN::MutexLocker l(_downloadIdentifierLock);
+	
 	if (!_downloaderImplementsSetProgress || _downloadIdentifier == nil) {
 		return;
 	}
 
 	ASImageDownloaderProgressImage progress = nil;
-	if (ASInterfaceStateIncludesVisible(self.interfaceState)) {
+	if (ASInterfaceStateIncludesVisible(interfaceState)) {
 		__weak __typeof__(self) weakSelf = self;
 		progress = ^(UIImage * _Nonnull progressImage, id _Nullable downloadIdentifier) {
 			__typeof__(self) strongSelf = weakSelf;
diff --git a/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m b/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m
index 13f304f76e..778f7cf13f 100644
--- a/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m
+++ b/AsyncDisplayKit/Details/ASPINRemoteImageDownloader.m
@@ -36,9 +36,9 @@
   return result.image;
 }
 
-- (void)fetchCachedImageWithURL:(NSURL *)URL
-                  callbackQueue:(dispatch_queue_t)callbackQueue
-                     completion:(void (^)(CGImageRef imageFromCache))completion
+- (void)cachedImageWithURL:(NSURL *)URL
+			 callbackQueue:(dispatch_queue_t)callbackQueue
+				completion:(ASImageCacherCompletion)completion
 {
   // We do not check the cache here and instead check it in downloadImageWithURL to avoid checking the cache twice.
   // If we're targeting the main queue and we're on the main thread, complete immediately.