diff --git a/WHATS_NEW b/WHATS_NEW
index de65e0ef7..878aa7a99 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.172 - 
 ===============================
+  Cache format2 flag is now using segment name type field.
   Support storing status flags via segtype name field.
   Stop using '--yes' mode when fsadm runs without terminal.
   Extend validation of filesystems resized by fsadm.
diff --git a/lib/format_text/export.c b/lib/format_text/export.c
index 829b46d85..f369089e3 100644
--- a/lib/format_text/export.c
+++ b/lib/format_text/export.c
@@ -584,6 +584,11 @@ static int _print_pvs(struct formatter *f, struct volume_group *vg)
 static int _print_segment(struct formatter *f, struct volume_group *vg,
 			  int count, struct lv_segment *seg)
 {
+	char buffer[2048];
+
+	if (!print_segtype_lvflags(buffer, sizeof(buffer), seg->lv->status))
+		return_0;
+
 	outf(f, "segment%u {", count);
 	_inc_indent(f);
 
@@ -594,7 +599,8 @@ static int _print_segment(struct formatter *f, struct volume_group *vg,
 	if (seg->reshape_len)
 		outsize(f, (uint64_t) seg->reshape_len * vg->extent_size,
 			"reshape_count = %u", seg->reshape_len);
-	outf(f, "type = \"%s\"", seg->segtype->name);
+
+	outf(f, "type = \"%s%s\"", seg->segtype->name, buffer);
 
 	if (!_out_list(f, &seg->tags, "tags"))
 		return_0;
diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c
index 64bad1c07..04896f469 100644
--- a/lib/format_text/flags.c
+++ b/lib/format_text/flags.c
@@ -67,7 +67,7 @@ static const struct flag _lv_flags[] = {
 	{LV_WRITEMOSTLY, "WRITEMOSTLY", STATUS_FLAG},
 	{LV_ACTIVATION_SKIP, "ACTIVATION_SKIP", COMPATIBLE_FLAG},
 	{LV_ERROR_WHEN_FULL, "ERROR_WHEN_FULL", COMPATIBLE_FLAG},
-	{LV_METADATA_FORMAT, "METADATA_FORMAT", STATUS_FLAG},
+	{LV_METADATA_FORMAT, "METADATA_FORMAT", SEGTYPE_FLAG},
 	{LV_NOSCAN, NULL, 0},
 	{LV_TEMPORARY, NULL, 0},
 	{POOL_METADATA_SPARE, NULL, 0},
@@ -138,7 +138,7 @@ int print_flags(char *buffer, size_t size, enum pv_vg_lv_e type, int mask, uint6
 		if (status & flags[f].mask) {
 			status &= ~flags[f].mask;
 
-			if ((type & STATUS_FLAG) != flags[f].kind)
+			if (mask != flags[f].kind)
 				continue;
 
 			/* Internal-only flag? */
diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h
index abb9b0e75..4b476363e 100644
--- a/lib/format_text/import-export.h
+++ b/lib/format_text/import-export.h
@@ -43,6 +43,7 @@ enum pv_vg_lv_e {
 
 #define COMPATIBLE_FLAG	0x01
 #define STATUS_FLAG	0x02
+#define SEGTYPE_FLAG	0x04
 
 struct text_vg_version_ops {
 	int (*check_version) (const struct dm_config_tree * cf);
diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c
index 6acfe1d25..7d9257e27 100644
--- a/lib/format_text/import_vsn1.c
+++ b/lib/format_text/import_vsn1.c
@@ -140,7 +140,8 @@ static int _read_flag_config(const struct dm_config_node *n, uint64_t *status, i
 		return 0;
 	}
 
-	if (!(read_flags(status, type, STATUS_FLAG, cv))) {
+	/* For backward compatible metadata accept both type of flags */
+	if (!(read_flags(status, type, STATUS_FLAG | SEGTYPE_FLAG, cv))) {
 		log_error("Could not read status flags.");
 		return 0;
 	}
@@ -357,6 +358,7 @@ static int _read_segment(struct logical_volume *lv, const struct dm_config_node
 	uint32_t area_extents, start_extent, extent_count, reshape_count, data_copies;
 	struct segment_type *segtype;
 	const char *segtype_str;
+	char *segtype_with_flags;
 
 	if (!sn_child) {
 		log_error("Empty segment section.");
@@ -388,9 +390,24 @@ static int _read_segment(struct logical_volume *lv, const struct dm_config_node
 		return 0;
 	}
 
-	if (!(segtype = get_segtype_from_string(lv->vg->cmd, segtype_str)))
+        /* Locally duplicate to parse out status flag bits */
+	if (!(segtype_with_flags = dm_pool_strdup(mem, segtype_str))) {
+		log_error("Cannot duplicate segtype string.");
+		return 0;
+	}
+
+	if (!read_segtype_lvflags(&lv->status, segtype_with_flags)) {
+		log_error("Couldn't read segtype for logical volume %s.",
+			  display_lvname(lv));
+	       return 0;
+	}
+
+	if (!(segtype = get_segtype_from_string(lv->vg->cmd, segtype_with_flags)))
 		return_0;
 
+	/* Can drop temporary string here as nothing has allocated from VGMEM meanwhile */
+	dm_pool_free(mem, segtype_with_flags);
+
 	if (segtype->ops->text_import_area_count &&
 	    !segtype->ops->text_import_area_count(sn_child, &area_count))
 		return_0;