diff --git a/httplint/field/parsers/cache_control.py b/httplint/field/parsers/cache_control.py
index 42cb77a..49dac5f 100644
--- a/httplint/field/parsers/cache_control.py
+++ b/httplint/field/parsers/cache_control.py
@@ -34,14 +34,35 @@
 
 CONFLICTING_CC = {
     "no-store": [
+        "immutable",
         "max-age",
-        "s-maxage",
         "must-revalidate",
         "no-cache",
         "private",
+        "proxy-revalidate",
         "public",
+        "s-maxage",
+        "stale-if-error",
+        "stale-while-revalidate",
+    ],
+    "no-cache": [
+        "immutable",
+        "max-age",
+        "must-revalidate",
+        "proxy-revalidate",
+        "s-maxage",
+        "stale-if-error",
+        "stale-while-revalidate",
+        "pre-check",
+        "post-check",
+    ],
+    "must-revalidate": [
+        "immutable",
+        "stale-if-error",
+        "stale-while-revalidate",
+        "pre-check",
+        "post-check",
     ],
-    "no-cache": ["max-age", "s-maxage", "must-revalidate"],
 }