diff --git a/app/views/schools/show.html.erb b/app/views/schools/show.html.erb
index 0028dec..c56963f 100644
--- a/app/views/schools/show.html.erb
+++ b/app/views/schools/show.html.erb
@@ -36,6 +36,7 @@
   <% end %>
   <br>
   <br>
+   
   <table class="table table-striped table-bordered table-condensed">
     <thead>
       <tr>
@@ -51,7 +52,7 @@
   
     <tbody>
       <% @wrestlers.sort_by{|w| w.weight.max}.each do |wrestler| %>
-        <% if wrestler.school_id == @school.id %>
+        <% cache ["schools_view_wrestler", wrestler] do %>
           <tr>
             <td><%= wrestler.name %></td>
             <td><%= wrestler.weight.max %></td>
@@ -63,6 +64,7 @@
               Yes
              <% end %></td>
              <td><%= wrestler.nextMatchBoutNumber %> <%= wrestler.nextMatchMatName %></td>
+        <% end %>
              <td>
               <%= link_to 'Show', wrestler , :class=>"btn btn-default btn-sm" %>
               <% if can? :manage, wrestler.school %>
@@ -71,7 +73,6 @@
               <% end %>   
             </td>
           </tr>
-        <% end %>
       <% end %>
     </tbody>
   </table>
diff --git a/app/views/wrestlers/show.html.erb b/app/views/wrestlers/show.html.erb
index c74b305..24794ba 100644
--- a/app/views/wrestlers/show.html.erb
+++ b/app/views/wrestlers/show.html.erb
@@ -5,6 +5,7 @@
   <% if can? :manage, @school %>
     | <%= link_to "Edit #{@wrestler.name}", edit_wrestler_path(@wrestler), :class=>"btn btn-primary" %>
   <% end %>
+<% cache ["wrestlers", @wrestler] do %> 
   <br>
   <br>
   <p>
@@ -44,3 +45,4 @@
   <% @wrestler.deductedPoints.each do |w| %>
   <div> Deducted points: <%= w.points %></div>
   <% end %>
+<% end %>
\ No newline at end of file