diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 95e4e28c8d4..ba06ffd5c0d 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1201,6 +1201,7 @@ class Attachment < ActiveRecord::Base
         locked = {:asset_string => self.asset_string, :lock_at => self.lock_at}
       elsif self.could_be_locked && item = locked_by_module_item?(user, opts[:deep_check_if_needed])
         locked = {:asset_string => self.asset_string, :context_module => item.context_module.attributes}
+        locked[:unlock_at] = locked[:context_module]["unlock_at"] if locked[:context_module]["unlock_at"]
       end
       locked
     end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 2a9f7e6635c..86537e2d166 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -198,6 +198,7 @@ class WikiPage < ActiveRecord::Base
       locked = false
       if (m && !m.available_for?(user))
         locked = {:asset_string => self.asset_string, :context_module => m.attributes}
+        locked[:unlock_at] = locked[:context_module]["unlock_at"] if locked[:context_module]["unlock_at"]
       end
       locked
     end
diff --git a/lib/has_content_tags.rb b/lib/has_content_tags.rb
index 351a7824fff..41881f0e05c 100644
--- a/lib/has_content_tags.rb
+++ b/lib/has_content_tags.rb
@@ -43,7 +43,7 @@ module HasContentTags
   end
   
   def locked_cache_key(user)
-    ['_locked_for', self, user].cache_key
+    ['_locked_for2', self, user].cache_key
   end
   
   def clear_locked_cache(user)