diff --git a/src/Messages/Attachments/TSAttachmentStream.h b/src/Messages/Attachments/TSAttachmentStream.h
index dfa286edb..c206198fd 100644
--- a/src/Messages/Attachments/TSAttachmentStream.h
+++ b/src/Messages/Attachments/TSAttachmentStream.h
@@ -46,11 +46,11 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)attachmentsFolder;
 + (NSUInteger)numberOfItemsInAttachmentsFolder;
 
-- (CGSize)cachedImageSizeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
-- (CGSize)cachedImageSizeWithoutTransaction;
+- (CGSize)imageSizeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
+- (CGSize)imageSizeWithoutTransaction;
 
-- (CGFloat)cachedAudioDurationSecondsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
-- (CGFloat)cachedAudioDurationSecondsWithoutTransaction;
+- (CGFloat)audioDurationSecondsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
+- (CGFloat)audioDurationSecondsWithoutTransaction;
 
 @end
 
diff --git a/src/Messages/Attachments/TSAttachmentStream.m b/src/Messages/Attachments/TSAttachmentStream.m
index 6b77ff2bf..3833c67ec 100644
--- a/src/Messages/Attachments/TSAttachmentStream.m
+++ b/src/Messages/Attachments/TSAttachmentStream.m
@@ -374,19 +374,15 @@ NS_ASSUME_NONNULL_BEGIN
     return imageSize;
 }
 
-- (CGSize)cachedImageSizeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
+- (CGSize)imageSizeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
 {
     OWSAssert([NSThread isMainThread]);
     OWSAssert(transaction);
 
-    if (self.cachedImageWidth && self.cachedImageHeight) {
-        return CGSizeMake(self.cachedImageWidth.floatValue, self.cachedImageHeight.floatValue);
-    }
-
     return [self ensureCachedImageSizeWithTransaction:transaction];
 }
 
-- (CGSize)cachedImageSizeWithoutTransaction
+- (CGSize)imageSizeWithoutTransaction
 {
     OWSAssert([NSThread isMainThread]);
 
@@ -449,19 +445,15 @@ NS_ASSUME_NONNULL_BEGIN
     return audioDurationSeconds;
 }
 
-- (CGFloat)cachedAudioDurationSecondsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
+- (CGFloat)audioDurationSecondsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
 {
     OWSAssert([NSThread isMainThread]);
     OWSAssert(transaction);
 
-    if (self.cachedAudioDurationSeconds) {
-        return self.cachedAudioDurationSeconds.floatValue;
-    }
-
     return [self ensureCachedAudioDurationSecondsWithTransaction:transaction];
 }
 
-- (CGFloat)cachedAudioDurationSecondsWithoutTransaction
+- (CGFloat)audioDurationSecondsWithoutTransaction
 {
     OWSAssert([NSThread isMainThread]);