diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index dc6d88348..16da06595 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -1,14 +1,16 @@
 module PhotosHelper
   def crop_image_path(crop)
-    if crop.default_photo.present?
-      # The flickr thumbnails are too small, use full size
-      if crop.default_photo.source == 'flickr'
-        crop.default_photo.fullsize_url
+    Rails.cache.fetch("crop_image_path/#{crop.id}") do
+      if crop.default_photo.present?
+        # The flickr thumbnails are too small, use full size
+        if crop.default_photo.source == 'flickr'
+          crop.default_photo.fullsize_url
+        else
+          crop.default_photo.thumbnail_url
+        end
       else
-        crop.default_photo.thumbnail_url
+        placeholder_image
       end
-    else
-      placeholder_image
     end
   end
 
diff --git a/app/models/concerns/photo_capable.rb b/app/models/concerns/photo_capable.rb
index 9cb440bd7..a4f0bd1a7 100644
--- a/app/models/concerns/photo_capable.rb
+++ b/app/models/concerns/photo_capable.rb
@@ -12,7 +12,9 @@ module PhotoCapable
     end
 
     def most_liked_photo
-      photos.order(likes_count: :desc, created_at: :desc).first
+      Rails.cache.fetch("most_liked_photo/#{model_name}/#{id}") do
+        photos.order(likes_count: :desc, created_at: :desc).first
+      end
     end
   end
 end