diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index db81aa7b5..ee2136d93 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -36,7 +36,6 @@ class TagsController < ApplicationController
     @tag = Tag.find(params[:id])
     check_privilege(@tag)
     @tag.update_attributes(params[:tag], :as => CurrentUser.role)
-    @tag.update_category_cache_for_all
     respond_with(@tag)
   end
 
diff --git a/app/logical/alias_and_implication_importer.rb b/app/logical/alias_and_implication_importer.rb
index 144210668..4d704d53c 100644
--- a/app/logical/alias_and_implication_importer.rb
+++ b/app/logical/alias_and_implication_importer.rb
@@ -117,7 +117,6 @@ private
           tag = Tag.find_by_name(token[1])
           tag.category = Tag.categories.value_for(token[2])
           tag.save
-          tag.update_category_cache_for_all
 
         else
           raise "Unknown token: #{token[0]}"
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 86e4a4278..4a0ef2e28 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -15,6 +15,8 @@ class Tag < ApplicationRecord
   validates :name, uniqueness: true, tag_name: true, on: :create
   validates_inclusion_of :category, in: TagCategory.category_ids
 
+  after_save :update_category_cache_for_all, if: :category_changed?
+
   module ApiMethods
     def to_legacy_json
       return {
@@ -221,8 +223,7 @@ class Tag < ApplicationRecord
           tag.update_category_cache
 
           if category_id != tag.category && !tag.is_locked? && ((CurrentUser.is_builder? && tag.post_count < 10_000) || tag.post_count <= 50)
-            tag.update_column(:category, category_id)
-            tag.update_category_cache_for_all
+            tag.update_attribute(:category, category_id)
           end
         end
 
diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb
index b98a0eb55..84dcd4f1f 100644
--- a/app/models/tag_alias.rb
+++ b/app/models/tag_alias.rb
@@ -173,7 +173,6 @@ class TagAlias < TagRelationship
   def ensure_category_consistency
     if antecedent_tag.category != consequent_tag.category && antecedent_tag.category != Tag.categories.general
       consequent_tag.update_attribute(:category, antecedent_tag.category)
-      consequent_tag.update_category_cache_for_all
     end
 
     true
diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb
index 21e798b2a..0fd39ab03 100644
--- a/test/unit/tag_test.rb
+++ b/test/unit/tag_test.rb
@@ -112,11 +112,9 @@ class TagTest < ActiveSupport::TestCase
 
     should "reset its category after updating" do
       tag = FactoryGirl.create(:artist_tag)
-      tag.update_category_cache_for_all
       assert_equal(Tag.categories.artist, Cache.get("tc:#{Cache.hash(tag.name)}"))
 
       tag.update_attribute(:category, Tag.categories.copyright)
-      tag.update_category_cache_for_all
       assert_equal(Tag.categories.copyright, Cache.get("tc:#{Cache.hash(tag.name)}"))
     end