diff --git a/app/presenters/analyze/presenter.rb b/app/presenters/analyze/presenter.rb
index 391a4918..57c5169f 100644
--- a/app/presenters/analyze/presenter.rb
+++ b/app/presenters/analyze/presenter.rb
@@ -187,5 +187,20 @@ module Analyze
         income_params.split(",").map { |income| Income.find_by_slug(income) }.compact
       end
     end
+
+    def cache_objects
+      [subcategory,
+       selected_academic_years,
+       graph,
+       selected_races,
+       selected_grades,
+       grades,
+       selected_genders,
+       genders,
+       selected_ells,
+       ells,
+       selected_speds,
+       speds]
+    end
   end
 end
diff --git a/app/views/analyze/index.html.erb b/app/views/analyze/index.html.erb
index 84737b19..909cd431 100644
--- a/app/views/analyze/index.html.erb
+++ b/app/views/analyze/index.html.erb
@@ -13,7 +13,7 @@
     <%= render partial: "school_years", locals: {available_academic_years: @presenter.academic_years, selected_academic_years: @presenter.selected_academic_years, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory, measures: @presenter.measures, graph: @presenter.graph} %>
     <%= render partial: "data_filters", locals: {district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory} %>
   </div>
-  <% cache [@presenter.subcategory, @school, @presenter.selected_academic_years,  @presenter.graph, @presenter.selected_races,  @presenter.selected_grades, @presenter.grades, @presenter.selected_genders, @presenter.genders, @presenter.selected_ells, @presenter.ells]  do %>
+  <% cache [@school, @presenter.cache_objects]  do %>
     <div class="bg-color-white flex-grow-1 col-9">
       <% @presenter.measures.each do  |measure| %>
         <section class="mb-6">