diff --git a/.gitignore b/.gitignore
index 0cd336786..d5a0e5f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /files/*
 /log/*
 /tmp/*
+/cache/*
 .gitignore
 /public/images/avatars/*
 /Gemfile
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 869e9a9a6..765fda433 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -11,7 +11,7 @@ RedmineApp::Application.configure do
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = true
-  config.cache_store = :file_store,  "#{Rails.root }/public/cache/"
+  config.cache_store = :file_store,  "#{Rails.root }/public/tmp/"
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false