diff --git a/liquor-cabinet.rb b/liquor-cabinet.rb
index 71eecd1..45ca9f3 100644
--- a/liquor-cabinet.rb
+++ b/liquor-cabinet.rb
@@ -46,6 +46,7 @@ class LiquorCabinet < Sinatra::Base
               'Access-Control-Expose-Headers' => 'ETag'
       headers['Access-Control-Allow-Origin'] = env["HTTP_ORIGIN"] if env["HTTP_ORIGIN"]
       headers['Cache-Control'] = 'no-cache'
+      headers['Expires'] = 0
 
       @user, @key = params[:user], params[:key]
       @directory = params[:splat] && params[:splat].first || ""
diff --git a/spec/directories_spec.rb b/spec/directories_spec.rb
index f563b49..128b496 100644
--- a/spec/directories_spec.rb
+++ b/spec/directories_spec.rb
@@ -67,6 +67,13 @@ describe "Directories" do
       last_response.headers["Access-Control-Expose-Headers"].must_equal "ETag"
     end
 
+    it "has caching headers set" do
+      get "/jimmy/tasks/"
+
+      last_response.status.must_equal 200
+      last_response.headers["Expires"].must_equal 0
+    end
+
     context "when If-None-Match header is set" do
       before do
         get "/jimmy/tasks/"
diff --git a/spec/riak_spec.rb b/spec/riak_spec.rb
index 3ac50a1..3794370 100644
--- a/spec/riak_spec.rb
+++ b/spec/riak_spec.rb
@@ -37,6 +37,11 @@ describe "App with Riak backend" do
       last_response.status.must_equal 200
       last_response.headers["ETag"].wont_be_nil
     end
+
+    it "has caching headers set" do
+      last_response.status.must_equal 200
+      last_response.headers["Expires"].must_equal 0
+    end
   end
 
   describe "GET data with custom content type" do