diff --git a/src/main/app/js/main.js b/src/main/app/js/main.js
index 23c55138..bb668c49 100644
--- a/src/main/app/js/main.js
+++ b/src/main/app/js/main.js
@@ -13,12 +13,6 @@ app.config([
 		function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider, cfpLoadingBarProvider,
 				$translateProvider) {
 			
-			// ie ajax cache workaround
-			if (!$httpProvider.defaults.headers.get) {
-				$httpProvider.defaults.headers.get = {};
-			}
-			$httpProvider.defaults.headers.get['If-Modified-Since'] = '0';
-
 			$translateProvider.useStaticFilesLoader({
 				prefix : 'i18n/',
 				suffix : '.js'
diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 43117b8e..0a658201 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -10,6 +10,9 @@ import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 
 import java.util.Date;
+import java.util.EnumSet;
+
+import javax.servlet.DispatcherType;
 
 import org.eclipse.jetty.server.session.SessionHandler;
 
@@ -32,6 +35,7 @@ import com.commafeed.backend.service.UserService;
 import com.commafeed.backend.task.OldStatusesCleanupTask;
 import com.commafeed.backend.task.OrphansCleanupTask;
 import com.commafeed.backend.task.SchedulingService;
+import com.commafeed.frontend.CacheFilter;
 import com.commafeed.frontend.auth.SecurityCheckProvider;
 import com.commafeed.frontend.auth.SecurityCheckProvider.SecurityCheckUserServiceProvider;
 import com.commafeed.frontend.resource.AdminREST;
@@ -145,6 +149,10 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		SwaggerConfig swaggerConfig = ConfigFactory.config();
 		swaggerConfig.setApiVersion("1");
 		swaggerConfig.setBasePath("/rest");
+
+		// cache configuration
+		environment.servlets().addFilter("cache-filter", new CacheFilter())
+				.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
 	}
 
 	public static void main(String[] args) throws Exception {
diff --git a/src/main/java/com/commafeed/frontend/CacheFilter.java b/src/main/java/com/commafeed/frontend/CacheFilter.java
new file mode 100644
index 00000000..ba03498e
--- /dev/null
+++ b/src/main/java/com/commafeed/frontend/CacheFilter.java
@@ -0,0 +1,29 @@
+package com.commafeed.frontend;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+public class CacheFilter implements Filter {
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		((HttpServletResponse) response).setHeader("Cache-Control", "no-cache");
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void destroy() {
+	}
+
+}