diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index f95d58742..8112fa4a3 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -240,7 +240,7 @@ class DText
       end
     end
 
-    sanitize(html.join("")).html_safe
+    html.join("").html_safe
   end
 
   def self.sanitize(text)
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index d1702e534..5c7f0b08d 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -73,7 +73,9 @@
       </section>
 
       <section id="notes" style="display: none;">
-        <%= render :partial => "notes/note", :collection => @post.notes.active %>
+        <% cache("p/#{@post.id}/n/#{@post.last_noted_at.to_i}") do
+          <%= render :partial => "notes/note", :collection => @post.notes.active %>
+        <% end %>
       </section>
 
       <% if CurrentUser.is_member? && Danbooru.config.can_user_see_post?(CurrentUser.user, @post) %>
@@ -130,13 +132,6 @@
     <meta name="twitter:image:width" content="<%= @post.image_width %>">
     <meta name="twitter:image:height" content="<%= @post.image_height %>">
   <% end %>
-
-  <% if @post.presenter.next_post_in_pool %>
-    <link rel="prefetch" href="<%= post_path(@post.presenter.next_post_in_pool, :pool_id => params[:pool_id]) %>">
-    <link rel="prerender" href="<%= post_path(@post.presenter.next_post_in_pool, :pool_id => params[:pool_id]) %>">
-    <link rel="prefetch" href="<%= Post.find(@post.presenter.next_post_in_pool).file_url_for(CurrentUser.user) %>">
-    <link rel="prerender" href="<%= Post.find(@post.presenter.next_post_in_pool).file_url_for(CurrentUser.user) %>">
-  <% end %>
 <% end %>
 
 <%= render "posts/partials/common/secondary_links" %>