diff --git a/app/settings.py b/app/settings.py
index d8dd5db..e73677f 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -67,7 +67,9 @@ MIDDLEWARE = [
     "debug_toolbar.middleware.DebugToolbarMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    # 'django.middleware.cache.UpdateCacheMiddleware',
     "django.middleware.common.CommonMiddleware",
+    # 'django.middleware.cache.FetchFromCacheMiddleware',
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
diff --git a/core/templates/partials/product-list.html b/core/templates/partials/product-list.html
index 9d845b3..89c2d26 100644
--- a/core/templates/partials/product-list.html
+++ b/core/templates/partials/product-list.html
@@ -1,48 +1,47 @@
 {% load static %}
+{% load cache %}
 
-{% for plan in plans %}
-
-
-  <div class="box">
-    <article class="media">
-      <div class="media-left">
-        <figure class="image is-64x64">
-          <img src="{% static plan.image %}" alt="Image">
-        </figure>
-      </div>
-      <div class="media-content">
-        <div class="content">
-          <p>
-            <strong>{{ plan.name }}</strong> <small>£{{ plan.cost }}</small>
-            {% if plan in user_plans %}
-              <i class="fas fa-check" aria-hidden="true"></i>
-            {% endif %}
-            <br>
-            {{ plan.description }}
-          </p>
+{% cache 600 objects_plans request.user.id plans %}
+  {% for plan in plans %}
+    <div class="box">
+      <article class="media">
+        <div class="media-left">
+          <figure class="image is-64x64">
+            <img src="{% static plan.image %}" alt="Image">
+          </figure>
         </div>
-        <nav class="level is-mobile">
-          <div class="level-left">
-            {% if plan not in user_plans %}
-              <a class="level-item" href="/order/{{ plan.name }}">
-                <span class="icon is-small has-text-success">
-                  <i class="fas fa-plus" aria-hidden="true"></i>
-                </span>
-              </a>
-            {% endif %}
-
-            {% if plan in user_plans %}
-              <a class="level-item" href="/cancel_subscription/{{ plan.name }}">
-                <span class="icon is-small has-text-info">
-                  <i class="fas fa-cancel" aria-hidden="true"></i>
-                </span>
-              </a>
-            {% endif %}
+        <div class="media-content">
+          <div class="content">
+            <p>
+              <strong>{{ plan.name }}</strong> <small>£{{ plan.cost }}</small>
+              {% if plan in user_plans %}
+                <i class="fas fa-check" aria-hidden="true"></i>
+              {% endif %}
+              <br>
+              {{ plan.description }}
+            </p>
           </div>
-        </nav>
-      </div>
-    </article>
-  </div>
-{% endfor %}
-
+          <nav class="level is-mobile">
+            <div class="level-left">
+              {% if plan not in user_plans %}
+                <a class="level-item" href="/order/{{ plan.name }}">
+                  <span class="icon is-small has-text-success">
+                    <i class="fas fa-plus" aria-hidden="true"></i>
+                  </span>
+                </a>
+              {% endif %}
 
+              {% if plan in user_plans %}
+                <a class="level-item" href="/cancel_subscription/{{ plan.name }}">
+                  <span class="icon is-small has-text-info">
+                    <i class="fas fa-cancel" aria-hidden="true"></i>
+                  </span>
+                </a>
+              {% endif %}
+            </div>
+          </nav>
+        </div>
+      </article>
+    </div>
+  {% endfor %}
+{% endcache %}
\ No newline at end of file
diff --git a/core/templates/partials/rule-list.html b/core/templates/partials/rule-list.html
index 7fa3e08..89f8561 100644
--- a/core/templates/partials/rule-list.html
+++ b/core/templates/partials/rule-list.html
@@ -1,93 +1,95 @@
+{% load cache %}
 {% include 'mixins/partials/notify.html' %}
-
-<table
-  class="table is-fullwidth is-hoverable"
-  hx-target="#{{ context_object_name }}-table"
-  id="{{ context_object_name }}-table"
-  hx-swap="outerHTML"
-  hx-trigger="{{ context_object_name_singular }}Event from:body"
-  hx-get="{{ list_url }}">
-  <thead>
-    <th>id</th>
-    <th>user</th>
-    <th>name</th>
-    <th>interval</th>
-    <th>window</th>
-    <th>priority</th>
-    <th>topic</th>
-    <th>enabled</th>
-    <th>data length</th>
-    <th>match</th>
-    <th>actions</th>
-  </thead>
-  {% for item in object_list %}
-    <tr>
-      <td><a href="/?query=*&source=all&rule={{ item.id }}">{{ item.id }}</a></td>
-      <td>{{ item.user }}</td>
-      <td>{{ item.name }}</td>
-      <td>{{ item.interval }}s</td>
-      <td>{{ item.window|default_if_none:"—" }}</td>
-      <td>{{ item.priority }}</td>
-      <td>{{ item.topic|default_if_none:"—" }}</td>
-      <td>
-        {% if item.enabled %}
-          <span class="icon">
-            <i class="fa-solid fa-check"></i>
-          </span>
-        {% else %}
-          <span class="icon">
-            <i class="fa-solid fa-xmark"></i>
-          </span>
-        {% endif %}
-      </td>
-      <td>{{ item.data|length }}</td>
-      <td>{{ item.matches }}</td>
-      <td>
-        <div class="buttons">
-          <button
-            hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-            hx-get="{% url 'rule_update' type=type pk=item.id %}"
-            hx-trigger="click"
-            hx-target="#{{ type }}s-here"
-            hx-swap="innerHTML"
-            class="button">
-            <span class="icon-text">
-              <span class="icon">
-                <i class="fa-solid fa-pencil"></i>
-              </span>
+{% cache 600 objects_rules request.user.id object_list %}
+  <table
+    class="table is-fullwidth is-hoverable"
+    hx-target="#{{ context_object_name }}-table"
+    id="{{ context_object_name }}-table"
+    hx-swap="outerHTML"
+    hx-trigger="{{ context_object_name_singular }}Event from:body"
+    hx-get="{{ list_url }}">
+    <thead>
+      <th>id</th>
+      <th>user</th>
+      <th>name</th>
+      <th>interval</th>
+      <th>window</th>
+      <th>priority</th>
+      <th>topic</th>
+      <th>enabled</th>
+      <th>data length</th>
+      <th>match</th>
+      <th>actions</th>
+    </thead>
+    {% for item in object_list %}
+      <tr>
+        <td><a href="/?query=*&source=all&rule={{ item.id }}">{{ item.id }}</a></td>
+        <td>{{ item.user }}</td>
+        <td>{{ item.name }}</td>
+        <td>{{ item.interval }}s</td>
+        <td>{{ item.window|default_if_none:"—" }}</td>
+        <td>{{ item.priority }}</td>
+        <td>{{ item.topic|default_if_none:"—" }}</td>
+        <td>
+          {% if item.enabled %}
+            <span class="icon">
+              <i class="fa-solid fa-check"></i>
             </span>
-          </button>
-          <button
-            hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-            hx-delete="{% url 'rule_delete' type=type pk=item.id %}"
-            hx-trigger="click"
-            hx-target="#modals-here"
-            hx-swap="innerHTML"
-            hx-confirm="Are you sure you wish to delete {{ item.name }}?"
-            class="button">
-            <span class="icon-text">
-              <span class="icon">
-                <i class="fa-solid fa-xmark"></i>
-              </span>
+          {% else %}
+            <span class="icon">
+              <i class="fa-solid fa-xmark"></i>
             </span>
-          </button>
-          <button
-            hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-            hx-post="{% url 'rule_clear' type=type pk=item.id %}"
-            hx-trigger="click"
-            hx-target="#modals-here"
-            hx-swap="innerHTML"
-            hx-confirm="Are you sure you wish to clear matches for {{ item.name }}?"
-            class="button">
-            <span class="icon-text">
-              <span class="icon">
-                <i class="fa-solid fa-arrow-rotate-right"></i>
+          {% endif %}
+        </td>
+        <td>{{ item.data|length }}</td>
+        <td>{{ item.matches }}</td>
+        <td>
+          <div class="buttons">
+            <button
+              hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+              hx-get="{% url 'rule_update' type=type pk=item.id %}"
+              hx-trigger="click"
+              hx-target="#{{ type }}s-here"
+              hx-swap="innerHTML"
+              class="button">
+              <span class="icon-text">
+                <span class="icon">
+                  <i class="fa-solid fa-pencil"></i>
+                </span>
               </span>
-            </span>
-          </button>
-        </div>
-      </td>
-    </tr>
-  {% endfor %}
+            </button>
+            <button
+              hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+              hx-delete="{% url 'rule_delete' type=type pk=item.id %}"
+              hx-trigger="click"
+              hx-target="#modals-here"
+              hx-swap="innerHTML"
+              hx-confirm="Are you sure you wish to delete {{ item.name }}?"
+              class="button">
+              <span class="icon-text">
+                <span class="icon">
+                  <i class="fa-solid fa-xmark"></i>
+                </span>
+              </span>
+            </button>
+            <button
+              hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+              hx-post="{% url 'rule_clear' type=type pk=item.id %}"
+              hx-trigger="click"
+              hx-target="#modals-here"
+              hx-swap="innerHTML"
+              hx-confirm="Are you sure you wish to clear matches for {{ item.name }}?"
+              class="button">
+              <span class="icon-text">
+                <span class="icon">
+                  <i class="fa-solid fa-arrow-rotate-right"></i>
+                </span>
+              </span>
+            </button>
+          </div>
+        </td>
+      </tr>
+    {% endfor %}
 
-</table>
+  </table>
+{% endcache %}
\ No newline at end of file