diff --git a/WHATS_NEW b/WHATS_NEW
index a17902d17..162b58432 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 3.0.0
 =============
+  Cache can uses metadata format 2 with cleaner policy.
   Fix check if resized PV can also fit metadata area.
   Avoid showing internal error in lvs output or pvmoved LVs.
   Remove clvmd
diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c
index fe91feebd..c3bd2ec6f 100644
--- a/lib/metadata/cache_manip.c
+++ b/lib/metadata/cache_manip.c
@@ -843,12 +843,13 @@ int cache_set_metadata_format(struct lv_segment *seg, cache_metadata_format_t fo
 
 	/*
 	 * If policy is unselected, but format 2 is selected, policy smq is enforced.
-	 * ATM no other then smq policy is allowed to select format 2.
+	 * ATM no other then smq & cleaner policy is allowed to select format 2.
 	 */
 	if (!seg->policy_name) {
 		if (format == CACHE_METADATA_FORMAT_2)
 			seg->policy_name = "smq";
-	} else if (strcmp(seg->policy_name, "smq")) {
+	} else if (strcmp(seg->policy_name, "smq") &&
+		   strcmp(seg->policy_name, "cleaner")) {
 		seg->cache_metadata_format = CACHE_METADATA_FORMAT_1;
 		return 1;
 	}