diff --git a/mayan/apps/documents/managers.py b/mayan/apps/documents/managers.py
index b047b9d5e9..54e512ca71 100644
--- a/mayan/apps/documents/managers.py
+++ b/mayan/apps/documents/managers.py
@@ -25,10 +25,6 @@ class DocumentManager(models.Manager):
             self.model, using=self._db
         ).filter(in_trash=False).filter(is_stub=False)
 
-    def invalidate_cache(self):
-        for document in self.model.objects.all():
-            document.invalidate_cache()
-
 
 class DocumentPageCachedImage(models.Manager):
     def get_by_natural_key(self, filename, document_page_natural_key):
diff --git a/mayan/apps/documents/models/document_models.py b/mayan/apps/documents/models/document_models.py
index 9f205226c8..0934a95f02 100644
--- a/mayan/apps/documents/models/document_models.py
+++ b/mayan/apps/documents/models/document_models.py
@@ -136,10 +136,6 @@ class Document(models.Model):
         if latest_version:
             return latest_version.get_api_image_url(*args, **kwargs)
 
-    def invalidate_cache(self):
-        for document_version in self.versions.all():
-            document_version.invalidate_cache()
-
     @property
     def is_in_trash(self):
         return self.in_trash
diff --git a/mayan/apps/documents/models/document_page_models.py b/mayan/apps/documents/models/document_page_models.py
index 3461d1f152..b4fa0ea1df 100644
--- a/mayan/apps/documents/models/document_page_models.py
+++ b/mayan/apps/documents/models/document_page_models.py
@@ -64,7 +64,7 @@ class DocumentPage(models.Model):
         return partition
 
     def delete(self, *args, **kwargs):
-        self.invalidate_cache()
+        self.cache_partition.delete()
         super(DocumentPage, self).delete(*args, **kwargs)
 
     def detect_orientation(self):
@@ -234,9 +234,6 @@ class DocumentPage(models.Model):
                 )
                 raise
 
-    def invalidate_cache(self):
-        self.cache_partition.purge()
-
     @property
     def is_in_trash(self):
         return self.document.is_in_trash
diff --git a/mayan/apps/documents/models/document_version_models.py b/mayan/apps/documents/models/document_version_models.py
index 1428f9e615..be47d6329b 100644
--- a/mayan/apps/documents/models/document_version_models.py
+++ b/mayan/apps/documents/models/document_version_models.py
@@ -139,6 +139,7 @@ class DocumentVersion(models.Model):
             page.delete()
 
         self.file.storage.delete(self.file.name)
+        self.cache_partition.delete()
 
         return super(DocumentVersion, self).delete(*args, **kwargs)
 
@@ -225,11 +226,6 @@ class DocumentVersion(models.Model):
         return (self.checksum, self.document.natural_key())
     natural_key.dependencies = ['documents.Document']
 
-    def invalidate_cache(self):
-        self.cache_partition.purge()
-        for page in self.pages.all():
-            page.invalidate_cache()
-
     @property
     def is_in_trash(self):
         return self.document.is_in_trash