diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 5c9f4eab2..3704b2fa1 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,26 +1,28 @@
-<% css_id = parent_or_commentable_dom_id(parent_id, commentable) %>
-<div id="js-comment-form-<%= css_id %>" <%= "style='display:none'".html_safe if toggeable %>>
-  <%= form_for [commentable, Comment.new], remote: true do |f| %>
-    <%= label_tag "comment-body-#{css_id}", t("comments.form.leave_comment") %>
-    <%= f.text_area :body, id: "comment-body-#{css_id}", label: false %>
-    <%= f.hidden_field :commentable_type, value: commentable.class.name %>
-    <%= f.hidden_field :commentable_id, value: commentable.id %>
-    <%= f.hidden_field :parent_id, value: parent_id %>
+<% cache [locale_and_user_status, parent_id, commentable_cache_key(commentable)] do %>
+  <% css_id = parent_or_commentable_dom_id(parent_id, commentable) %>
+  <div id="js-comment-form-<%= css_id %>" <%= "style='display:none'".html_safe if toggeable %>>
+    <%= form_for [commentable, Comment.new], remote: true do |f| %>
+      <%= label_tag "comment-body-#{css_id}", t("comments.form.leave_comment") %>
+      <%= f.text_area :body, id: "comment-body-#{css_id}", label: false %>
+      <%= f.hidden_field :commentable_type, value: commentable.class.name %>
+      <%= f.hidden_field :commentable_id, value: commentable.id %>
+      <%= f.hidden_field :parent_id, value: parent_id %>
 
-    <%= f.submit comment_button_text(parent_id), class: "button radius small inline-block" %>
+      <%= f.submit comment_button_text(parent_id), class: "button radius small inline-block" %>
+
+      <% if can? :comment_as_moderator, commentable %>
+        <div class="right">
+          <%= f.check_box :as_moderator, id: "comment-as-moderator-#{css_id}", label: false %>
+          <%= label_tag "comment-as-moderator-#{css_id}", t("comments.form.comment_as_moderator"), class: "checkbox" %>
+        </div>
+      <% end %>
+      <% if can? :comment_as_administrator, commentable %>
+        <div class="right">
+          <%= f.check_box :as_administrator, id: "comment-as-administrator-#{css_id}",label: false %>
+          <%= label_tag "comment-as-administrator-#{css_id}", t("comments.form.comment_as_admin"), class: "checkbox" %>
+        </div>
+      <% end %>
 
-    <% if can? :comment_as_moderator, commentable %>
-      <div class="right">
-        <%= f.check_box :as_moderator, id: "comment-as-moderator-#{css_id}", label: false %>
-        <%= label_tag "comment-as-moderator-#{css_id}", t("comments.form.comment_as_moderator"), class: "checkbox" %>
-      </div>
     <% end %>
-    <% if can? :comment_as_administrator, commentable %>
-      <div class="right">
-        <%= f.check_box :as_administrator, id: "comment-as-administrator-#{css_id}",label: false %>
-        <%= label_tag "comment-as-administrator-#{css_id}", t("comments.form.comment_as_admin"), class: "checkbox" %>
-      </div>
-    <% end %>
-
-  <% end %>
-</div>
+  </div>
+<% end %>