diff --git a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java
index d2e68ad817..59376c1faf 100644
--- a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java
+++ b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java
@@ -27,7 +27,9 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Luke Taylor
  * @since 3.0
+ * @deprecated Use {@link SecurityContextRepository#loadContext(HttpServletRequest)}
  */
+@Deprecated
 public final class HttpRequestResponseHolder {
 
 	private HttpServletRequest request;
diff --git a/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java
index 4fb534a565..94925e877e 100644
--- a/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java
@@ -16,6 +16,7 @@
 
 package org.springframework.security.web.context;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.core.context.SecurityContext;
@@ -39,7 +40,10 @@ import org.springframework.security.web.util.OnCommittedResponseWrapper;
  * @author Marten Algesten
  * @author Rob Winch
  * @since 3.0
+ * @deprecated Use {@link SecurityContextRepository#loadContext(HttpServletRequest)}
+ * instead.
  */
+@Deprecated
 public abstract class SaveContextOnUpdateOrErrorResponseWrapper extends OnCommittedResponseWrapper {
 
 	private boolean contextSaved = false;
diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
index 9a369a2161..0e7f869aac 100644
--- a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
+++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
@@ -57,7 +57,9 @@ import org.springframework.web.filter.GenericFilterBean;
  *
  * @author Luke Taylor
  * @since 3.0
+ * @deprecated Use {@link SecurityContextHolderFilter}
  */
+@Deprecated
 public class SecurityContextPersistenceFilter extends GenericFilterBean {
 
 	static final String FILTER_APPLIED = "__spring_security_scpf_applied";
diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
index fafba5b237..1e1805c81d 100644
--- a/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
+++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
@@ -60,7 +60,9 @@ public interface SecurityContextRepository {
 	 * the context should be loaded.
 	 * @return The security context which should be used for the current request, never
 	 * null.
+	 * @deprecated Use {@link #loadContext(HttpServletRequest)} instead.
 	 */
+	@Deprecated
 	SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder);
 
 	/**