diff --git a/app/models/post.rb b/app/models/post.rb
index 642900462..b3f038809 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -667,7 +667,7 @@ class Post < ActiveRecord::Base
         Cache.delete(Post.count_cache_key(tag_name))
       end
 
-      if Post.fast_count("").to_i < 1000
+      if CurrentUser.user.id < 1_000
         Cache.delete(Post.count_cache_key(""))
       end
     end
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index 3c0b05b43..1c62c2d06 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -357,6 +357,7 @@ class PostTest < ActiveSupport::TestCase
 
       context "with an artist tag that is then changed to copyright" do
         setup do
+          CurrentUser.user = FactoryGirl.create(:builder_user)
           Delayed::Worker.delay_jobs = false
           @post = Post.find(@post.id)
           @post.update_attribute(:tag_string, "art:abc")
diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb
index 845457225..63b7b775d 100644
--- a/test/unit/tag_test.rb
+++ b/test/unit/tag_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TagTest < ActiveSupport::TestCase
   setup do
-    user = FactoryGirl.create(:user)
+    user = FactoryGirl.create(:builder_user)
     CurrentUser.user = user
     CurrentUser.ip_addr = "127.0.0.1"
     MEMCACHE.flush_all