diff --git a/config/routes.rb b/config/routes.rb
index 58108ab4e..2228cda49 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,7 +12,11 @@ Zammad::Application.routes.draw do
   dir = File.expand_path('../', __FILE__)
   files = Dir.glob( "#{dir}/routes/*.rb" )
   for file in files
-    require file
+    if Rails.configuration.cache_classes
+      require file
+    else
+      load file
+    end
   end
 
 end
\ No newline at end of file
diff --git a/lib/facebook_database.rb b/vendor/lib/facebook_database.rb
similarity index 100%
rename from lib/facebook_database.rb
rename to vendor/lib/facebook_database.rb
diff --git a/lib/google_oauth2_database.rb b/vendor/lib/google_oauth2_database.rb
similarity index 100%
rename from lib/google_oauth2_database.rb
rename to vendor/lib/google_oauth2_database.rb
diff --git a/lib/linked_in_database.rb b/vendor/lib/linked_in_database.rb
similarity index 100%
rename from lib/linked_in_database.rb
rename to vendor/lib/linked_in_database.rb
diff --git a/lib/twitter_database.rb b/vendor/lib/twitter_database.rb
similarity index 100%
rename from lib/twitter_database.rb
rename to vendor/lib/twitter_database.rb