diff --git a/app/assets/javascripts/autocomplete.js.erb b/app/assets/javascripts/autocomplete.js.erb
index d9f436b3c..f3a61253d 100644
--- a/app/assets/javascripts/autocomplete.js.erb
+++ b/app/assets/javascripts/autocomplete.js.erb
@@ -194,7 +194,8 @@
             "search[name]": req.term + "*",
             "search[is_active]": true,
             "search[order]": "post_count",
-            "limit": 10
+            "limit": 10,
+            "expiry": 7
           },
           method: "get",
           success: function(data) {
@@ -235,7 +236,8 @@
             "search[title]": req.term + "*",
             "search[hide_deleted]": "Yes",
             "search[order]": "post_count",
-            "limit": 10
+            "limit": 10,
+            "expiry": 7
           },
           method: "get",
           success: function(data) {
@@ -259,7 +261,8 @@
     $.ajax({
       url: "/tags/autocomplete.json",
       data: {
-        "search[name_matches]": term
+        "search[name_matches]": term,
+        "expiry": 7
       },
       method: "get",
       success: function(data) {
diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index c5a19d6cf..c8dd2e92d 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -44,7 +44,7 @@ class ArtistsController < ApplicationController
       end
       format.json do
         render :json => @artists.to_json(:include => [:urls])
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end
@@ -109,7 +109,7 @@ class ArtistsController < ApplicationController
       end
       format.json do
         render :json => @artists.to_json(:include => [:sorted_urls])
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end
diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb
index f9b5fded7..02b7efd41 100644
--- a/app/controllers/pools_controller.rb
+++ b/app/controllers/pools_controller.rb
@@ -24,7 +24,7 @@ class PoolsController < ApplicationController
       end
       format.json do
         render json: @pool.to_json
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 145783a51..aa10f6490 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,8 +28,8 @@ class UsersController < ApplicationController
           render :xml => @users.to_xml(:root => "users")
         end
         format.json do
-          render json: @user.to_json
-          expires_in 7.days
+          render json: @users.to_json
+          expires_in params[:expiry].to_i.days if params[:expiry]
         end
       end
     end
diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index 7f442ea15..23543b728 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -31,7 +31,7 @@ class WikiPagesController < ApplicationController
       end
       format.json do
         render json: @wiki_pages.to_json
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end