diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index 6b121bb3ab..ecd57d94a9 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -7,9 +7,11 @@ config:
 complexity:
   LongParameterList:
     ignoreDefaultParameters: true
-    ignoreAnnotated: ['Inject']
+    ignoreAnnotated: ['Inject', 'Composable']
   TooManyFunctions:
     active: false
+  LongMethod:
+    ignoreAnnotated: ['Composable']
 
 coroutines:
   GlobalCoroutineUsage:
@@ -22,6 +24,7 @@ style:
   MagicNumber:
     ignoreEnums: true
     ignorePropertyDeclaration: true
+    ignoreAnnotated: ['Composable']
   SpacingBetweenPackageAndImports:
     active: true
   UnusedImports:
@@ -31,3 +34,7 @@ style:
   ForbiddenSuppress:
     active: true
     rules: ['MaximumLineLength']
+
+naming:
+  FunctionNaming:
+    ignoreAnnotated: [ 'Composable' ]
diff --git a/example/build.gradle b/example/build.gradle
index 862c762e3e..9416b1c33d 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -67,6 +67,11 @@ android {
     buildFeatures {
         buildConfig true
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 
     sourceSets {
@@ -137,6 +142,9 @@ dependencies {
     testImplementation sharedLibs.assertj.core
     testImplementation sharedLibs.androidx.arch.core.testing
 
+    implementation sharedLibs.androidx.compose.material
+    implementation sharedLibs.androidx.compose.ui.tooling
+
     androidTestImplementation sharedLibs.assertj.core
     androidTestImplementation sharedLibs.androidx.arch.core.testing
     androidTestCompileOnly sharedLibs.glassfish.javax.annotation
@@ -153,6 +161,9 @@ dependencies {
     debugImplementation sharedLibs.facebook.flipper.network.plugin
 
     // Coroutines
+    implementation platform("androidx.compose:compose-bom:2024.04.00")
+    implementation 'androidx.compose.material:material'
+
     implementation sharedLibs.kotlinx.coroutines.core
     implementation sharedLibs.kotlinx.coroutines.android
 
diff --git a/example/src/main/java/org/wordpress/android/fluxc/example/di/FragmentsModule.kt b/example/src/main/java/org/wordpress/android/fluxc/example/di/FragmentsModule.kt
index 881147889a..94abb7d3b6 100644
--- a/example/src/main/java/org/wordpress/android/fluxc/example/di/FragmentsModule.kt
+++ b/example/src/main/java/org/wordpress/android/fluxc/example/di/FragmentsModule.kt
@@ -31,6 +31,7 @@ import org.wordpress.android.fluxc.example.ui.customer.search.WooCustomersSearch
 import org.wordpress.android.fluxc.example.ui.gateways.WooGatewaysFragment
 import org.wordpress.android.fluxc.example.ui.helpsupport.WooHelpSupportFragment
 import org.wordpress.android.fluxc.example.ui.leaderboards.WooLeaderboardsFragment
+import org.wordpress.android.fluxc.example.ui.metadata.CustomFieldsFragment
 import org.wordpress.android.fluxc.example.ui.onboarding.WooOnboardingFragment
 import org.wordpress.android.fluxc.example.ui.orders.AddressEditDialogFragment
 import org.wordpress.android.fluxc.example.ui.orders.WooOrdersFragment
@@ -200,4 +201,7 @@ internal interface FragmentsModule {
 
     @ContributesAndroidInjector
     fun provideWooAdminFragment(): WooAdminFragment
+
+    @ContributesAndroidInjector
+    fun provideCustomFieldsFragment(): CustomFieldsFragment
 }
diff --git a/example/src/main/java/org/wordpress/android/fluxc/example/ui/metadata/CustomFieldsFragment.kt b/example/src/main/java/org/wordpress/android/fluxc/example/ui/metadata/CustomFieldsFragment.kt
new file mode 100644
index 0000000000..e1f8188a30
--- /dev/null
+++ b/example/src/main/java/org/wordpress/android/fluxc/example/ui/metadata/CustomFieldsFragment.kt
@@ -0,0 +1,230 @@
+package org.wordpress.android.fluxc.example.ui.metadata
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.Button
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.lifecycle.lifecycleScope
+import dagger.android.support.DaggerFragment
+import org.wordpress.android.fluxc.example.ui.metadata.CustomFieldsViewModel.CustomFieldsState
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
+import org.wordpress.android.fluxc.store.MetaDataStore
+import org.wordpress.android.fluxc.store.SiteStore
+import javax.inject.Inject
+
+class CustomFieldsFragment : DaggerFragment() {
+    companion object {
+        private const val ARG_PARENT_ITEM_TYPE = "parentItemType"
+        private const val ARG_PARENT_ITEM_ID = "parentItemId"
+        private const val ARG_SITE_ID = "siteId"
+
+        fun newInstance(
+            siteId: LocalId,
+            parentItemId: Long,
+            parentItemType: MetaDataParentItemType
+        ) = CustomFieldsFragment().apply {
+            arguments = Bundle().apply {
+                putInt(ARG_SITE_ID, siteId.value)
+                putLong(ARG_PARENT_ITEM_ID, parentItemId)
+                putString(ARG_PARENT_ITEM_TYPE, parentItemType.name)
+            }
+        }
+    }
+
+    @Inject lateinit var metaDataStore: MetaDataStore
+
+    @Inject lateinit var siteStore: SiteStore
+
+    private val viewModel by lazy {
+        CustomFieldsViewModel(
+            coroutineScope = lifecycleScope,
+            site = siteStore.getSiteByLocalId(requireArguments().getInt(ARG_SITE_ID))!!,
+            parentItemId = requireArguments().getLong(ARG_PARENT_ITEM_ID),
+            parentItemType = MetaDataParentItemType.valueOf(
+                requireArguments().getString(ARG_PARENT_ITEM_TYPE)!!
+            ),
+            metaDataStore = metaDataStore
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+
+            setContent {
+                MaterialTheme {
+                    CustomFieldsScreen(viewModel.state)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun CustomFieldsScreen(state: CustomFieldsState) {
+    when (state) {
+        CustomFieldsState.Loading -> CircularProgressIndicator(
+            modifier = Modifier
+                .fillMaxSize()
+                .wrapContentSize()
+        )
+
+        is CustomFieldsState.Error -> ErrorView(state)
+        is CustomFieldsState.Loaded -> ContentView(state)
+    }
+}
+
+@Composable
+private fun ErrorView(state: CustomFieldsState.Error) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+        modifier = Modifier.fillMaxSize()
+    ) {
+        Text("An error occurred!")
+        Text(state.message)
+        Spacer(modifier = Modifier.height(16.dp))
+        Button(state.onRetry) {
+            Text("Retry")
+        }
+    }
+}
+
+@Composable
+private fun ContentView(state: CustomFieldsState.Loaded) {
+    var fieldBeingEdited by remember { mutableStateOf<WCMetaData?>(null) }
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier.padding(16.dp)
+    ) {
+        Row(
+            modifier = Modifier.align(Alignment.End),
+            horizontalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            Button({ fieldBeingEdited = WCMetaData(id = 0L, "", "") }) {
+                Text("Add")
+            }
+            Button(onClick = state.onSave, enabled = state.hasChanges) {
+                Text("Save")
+            }
+        }
+
+        state.customFields.forEach { customField ->
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Column {
+                    Text(
+                        text = customField.key,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        style = MaterialTheme.typography.subtitle1,
+                        fontWeight = FontWeight.Bold
+                    )
+
+                    Text(
+                        text = customField.valueAsString,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                        style = MaterialTheme.typography.body2
+                    )
+                }
+                Spacer(modifier = Modifier.weight(1f))
+                IconButton({ fieldBeingEdited = customField }) {
+                    Icon(Icons.Default.Edit, contentDescription = "Edit")
+                }
+                IconButton({ state.onDelete(customField) }) {
+                    Icon(Icons.Default.Delete, contentDescription = "Delete")
+                }
+            }
+        }
+    }
+
+    if (fieldBeingEdited != null) {
+        val field = fieldBeingEdited!!
+        Dialog(onDismissRequest = { fieldBeingEdited = null }) {
+            Column(
+                modifier = Modifier
+                    .background(MaterialTheme.colors.surface)
+                    .padding(8.dp)
+            ) {
+                Text("Edit field")
+                Spacer(modifier = Modifier.height(16.dp))
+                OutlinedTextField(
+                    label = { Text("Key") },
+                    value = field.key,
+                    onValueChange = {
+                        fieldBeingEdited = field.copy(key = it)
+                    },
+                    modifier = Modifier.fillMaxWidth()
+                )
+                OutlinedTextField(
+                    label = { Text("Value") },
+                    value = field.valueAsString,
+                    onValueChange = {
+                        fieldBeingEdited = field.copy(
+                            value = WCMetaDataValue.StringValue(it)
+                        )
+                    },
+                    modifier = Modifier.fillMaxWidth()
+                )
+                Button(
+                    onClick = {
+                        if (field.id == 0L) {
+                            state.onAdd(field)
+                        } else {
+                            state.onEdit(field)
+                        }
+                        fieldBeingEdited = null
+                    },
+                    modifier = Modifier.align(Alignment.End)
+                ) {
+                    Text("Done")
+                }
+            }
+        }
+    }
+}
diff --git a/example/src/main/java/org/wordpress/android/fluxc/example/ui/metadata/CustomFieldsViewModel.kt b/example/src/main/java/org/wordpress/android/fluxc/example/ui/metadata/CustomFieldsViewModel.kt
new file mode 100644
index 0000000000..2b0b3ccf25
--- /dev/null
+++ b/example/src/main/java/org/wordpress/android/fluxc/example/ui/metadata/CustomFieldsViewModel.kt
@@ -0,0 +1,170 @@
+package org.wordpress.android.fluxc.example.ui.metadata
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.store.MetaDataStore
+
+class CustomFieldsViewModel(
+    private val coroutineScope: CoroutineScope,
+    private val site: SiteModel,
+    private val parentItemId: Long,
+    private val parentItemType: MetaDataParentItemType,
+    private val metaDataStore: MetaDataStore
+) {
+    private val loadingState = MutableStateFlow<LoadingState>(LoadingState.Loaded)
+    var state by mutableStateOf<CustomFieldsState>(CustomFieldsState.Loading)
+        private set
+
+    private val pendingUpdateRequest = MutableStateFlow(
+        UpdateMetadataRequest(
+            parentItemId = parentItemId,
+            parentItemType = parentItemType,
+            insertedMetadata = emptyList(),
+            updatedMetadata = emptyList(),
+            deletedMetadata = emptyList()
+        )
+    )
+
+    init {
+        observeLoadingState()
+        loadCustomFields()
+    }
+
+    private fun observeLoadingState() {
+        val customFields = combine(
+            metaDataStore.observeDisplayableMetaData(
+                site,
+                parentItemId
+            ),
+            pendingUpdateRequest
+        ) { customFields, pendingUpdateRequest ->
+            customFields.filterNot { it in pendingUpdateRequest.deletedMetadata }
+                .map { field ->
+                    pendingUpdateRequest.updatedMetadata.find { it.key == field.key }
+                        ?: field
+                } + pendingUpdateRequest.insertedMetadata
+        }
+
+        combine(
+            loadingState,
+            customFields,
+            pendingUpdateRequest.map {
+                it.insertedMetadata.isNotEmpty() ||
+                    it.updatedMetadata.isNotEmpty() ||
+                    it.deletedMetadata.isNotEmpty()
+            }
+        ) { loadingState, metaData, hasChanges ->
+            when (loadingState) {
+                LoadingState.Loading -> CustomFieldsState.Loading
+                LoadingState.Loaded -> CustomFieldsState.Loaded(
+                    customFields = metaData,
+                    onDelete = { field ->
+                        pendingUpdateRequest.update {
+                            it.copy(
+                                deletedMetadata = it.deletedMetadata + field
+                            )
+                        }
+                    },
+                    onEdit = { field ->
+                        pendingUpdateRequest.update {
+                            it.copy(
+                                updatedMetadata = it.updatedMetadata + field
+                            )
+                        }
+                    },
+                    onAdd = { field ->
+                        pendingUpdateRequest.update {
+                            it.copy(
+                                insertedMetadata = it.insertedMetadata + field
+                            )
+                        }
+                    },
+                    onSave = { saveChanges() },
+                    hasChanges = hasChanges
+                )
+
+                is LoadingState.Error -> CustomFieldsState.Error(loadingState.message) {
+                    loadCustomFields()
+                }
+            }
+        }.onEach {
+            state = it
+        }.launchIn(coroutineScope)
+    }
+
+    private fun loadCustomFields() {
+        coroutineScope.launch {
+            launch {
+                loadingState.value = LoadingState.Loading
+                metaDataStore.refreshMetaData(site, parentItemId, parentItemType).let {
+                    if (it.isError) {
+                        loadingState.value = LoadingState.Error(
+                            message = it.error?.message ?: "Unknown error"
+                        )
+                    } else {
+                        loadingState.value = LoadingState.Loaded
+                    }
+                }
+            }
+        }
+    }
+
+    private fun saveChanges() {
+        coroutineScope.launch {
+            loadingState.value = LoadingState.Loading
+            val request = pendingUpdateRequest.value
+            metaDataStore.updateMetaData(site, request).let { result ->
+                if (result.isError) {
+                    loadingState.value = LoadingState.Error(
+                        message = result.error?.message ?: "Unknown error"
+                    )
+                } else {
+                    pendingUpdateRequest.update {
+                        it.copy(
+                            insertedMetadata = emptyList(),
+                            updatedMetadata = emptyList(),
+                            deletedMetadata = emptyList()
+                        )
+                    }
+                    loadingState.value = LoadingState.Loaded
+                }
+            }
+        }
+    }
+
+    private sealed interface LoadingState {
+        data object Loading : LoadingState
+        data object Loaded : LoadingState
+        data class Error(val message: String) : LoadingState
+    }
+
+    sealed interface CustomFieldsState {
+        data object Loading : CustomFieldsState
+        data class Loaded(
+            val customFields: List<WCMetaData>,
+            val onDelete: (WCMetaData) -> Unit,
+            val onEdit: (WCMetaData) -> Unit,
+            val onAdd: (WCMetaData) -> Unit,
+            val onSave: () -> Unit,
+            val hasChanges: Boolean = false
+        ) : CustomFieldsState
+
+        data class Error(
+            val message: String,
+            val onRetry: () -> Unit
+        ) : CustomFieldsState
+    }
+}
diff --git a/example/src/main/java/org/wordpress/android/fluxc/example/ui/orders/WooOrdersFragment.kt b/example/src/main/java/org/wordpress/android/fluxc/example/ui/orders/WooOrdersFragment.kt
index 98d1db7c2e..07405d58fc 100644
--- a/example/src/main/java/org/wordpress/android/fluxc/example/ui/orders/WooOrdersFragment.kt
+++ b/example/src/main/java/org/wordpress/android/fluxc/example/ui/orders/WooOrdersFragment.kt
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.greenrobot.eventbus.Subscribe
@@ -22,6 +21,7 @@ import org.wordpress.android.fluxc.example.databinding.FragmentWooOrdersBinding
 import org.wordpress.android.fluxc.example.prependToLog
 import org.wordpress.android.fluxc.example.replaceFragment
 import org.wordpress.android.fluxc.example.ui.StoreSelectingFragment
+import org.wordpress.android.fluxc.example.ui.metadata.CustomFieldsFragment
 import org.wordpress.android.fluxc.example.ui.orders.AddressEditDialogFragment.AddressType
 import org.wordpress.android.fluxc.example.ui.orders.AddressEditDialogFragment.AddressType.BILLING
 import org.wordpress.android.fluxc.example.ui.orders.AddressEditDialogFragment.AddressType.SHIPPING
@@ -29,10 +29,11 @@ import org.wordpress.android.fluxc.example.utils.showSingleLineDialog
 import org.wordpress.android.fluxc.example.utils.showTwoButtonsDialog
 import org.wordpress.android.fluxc.generated.WCOrderActionBuilder
 import org.wordpress.android.fluxc.model.OrderAttributionInfo
-import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
 import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
 import org.wordpress.android.fluxc.model.order.OrderAddress
 import org.wordpress.android.fluxc.model.order.UpdateOrderRequest
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
@@ -629,6 +630,26 @@ class WooOrdersFragment : StoreSelectingFragment(), WCAddOrderShipmentTrackingDi
                     }
                 }
             }
+
+            customFields.setOnClickListener {
+                selectedSite?.let { site ->
+                    lifecycleScope.launch {
+                        val orderId = showSingleLineDialog(
+                            activity = requireActivity(),
+                            message = "Please enter the order id",
+                            isNumeric = true
+                        )?.toLongOrNull() ?: return@launch
+
+                        replaceFragment(
+                            CustomFieldsFragment.newInstance(
+                                siteId = site.localId(),
+                                parentItemId = orderId,
+                                parentItemType = MetaDataParentItemType.ORDER
+                            )
+                        )
+                    }
+                }
+            }
         }
     }
 
diff --git a/example/src/main/java/org/wordpress/android/fluxc/example/ui/products/WooProductsFragment.kt b/example/src/main/java/org/wordpress/android/fluxc/example/ui/products/WooProductsFragment.kt
index 092a429271..86bb996e7d 100644
--- a/example/src/main/java/org/wordpress/android/fluxc/example/ui/products/WooProductsFragment.kt
+++ b/example/src/main/java/org/wordpress/android/fluxc/example/ui/products/WooProductsFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
@@ -22,11 +23,13 @@ import org.wordpress.android.fluxc.example.databinding.FragmentWooProductsBindin
 import org.wordpress.android.fluxc.example.prependToLog
 import org.wordpress.android.fluxc.example.replaceFragment
 import org.wordpress.android.fluxc.example.ui.StoreSelectingFragment
+import org.wordpress.android.fluxc.example.ui.metadata.CustomFieldsFragment
 import org.wordpress.android.fluxc.example.utils.showSingleLineDialog
 import org.wordpress.android.fluxc.generated.WCProductActionBuilder
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.WCProductCategoryModel
 import org.wordpress.android.fluxc.model.WCProductImageModel
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductStockStatus
 import org.wordpress.android.fluxc.store.MediaStore
 import org.wordpress.android.fluxc.store.WCAddonsStore
@@ -655,6 +658,26 @@ class WooProductsFragment : StoreSelectingFragment() {
                 }
             }
         }
+
+        binding?.customFields?.setOnClickListener {
+            selectedSite?.let { site ->
+                lifecycleScope.launch {
+                    val orderId = showSingleLineDialog(
+                        activity = requireActivity(),
+                        message = "Please enter the product id",
+                        isNumeric = true
+                    )?.toLongOrNull() ?: return@launch
+
+                    replaceFragment(
+                        CustomFieldsFragment.newInstance(
+                            siteId = site.localId(),
+                            parentItemId = orderId,
+                            parentItemType = MetaDataParentItemType.PRODUCT
+                        )
+                    )
+                }
+            }
+        }
     }
 
     /**
diff --git a/example/src/main/res/layout/fragment_woo_orders.xml b/example/src/main/res/layout/fragment_woo_orders.xml
index 4dd83394e2..d868d5a339 100644
--- a/example/src/main/res/layout/fragment_woo_orders.xml
+++ b/example/src/main/res/layout/fragment_woo_orders.xml
@@ -173,5 +173,12 @@
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Fetch Order Attribution" />
+
+        <Button
+            android:id="@+id/custom_fields"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:text="View Order Custom Fields" />
     </LinearLayout>
 </ScrollView>
diff --git a/example/src/main/res/layout/fragment_woo_products.xml b/example/src/main/res/layout/fragment_woo_products.xml
index ae7eb8c581..589a29b082 100644
--- a/example/src/main/res/layout/fragment_woo_products.xml
+++ b/example/src/main/res/layout/fragment_woo_products.xml
@@ -242,5 +242,12 @@
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Fetch product stock report" />
+
+        <Button
+            android:id="@+id/custom_fields"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:text="View Product Custom Fields" />
     </LinearLayout>
 </ScrollView>
diff --git a/example/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt b/example/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt
index a55d5d296c..bcf13e6e1f 100644
--- a/example/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt
+++ b/example/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt
@@ -8,12 +8,12 @@ import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.mock
 import org.wordpress.android.fluxc.JsonLoaderUtils.jsonFileAs
 import org.wordpress.android.fluxc.model.LocalOrRemoteId
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
 import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.FlatFee
 import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteRestrictionsType.AnyText
 import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.Checkbox
-import org.wordpress.android.fluxc.model.get
+import org.wordpress.android.fluxc.model.metadata.get
 import kotlin.test.fail
 
 class ProductDtoMapperTest {
diff --git a/example/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt b/example/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt
index b04ee13b68..b0be003fe4 100644
--- a/example/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt
+++ b/example/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt
@@ -7,7 +7,7 @@ import org.mockito.kotlin.mock
 import org.wordpress.android.fluxc.UnitTestUtils
 import org.wordpress.android.fluxc.model.LocalOrRemoteId
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductApiResponse
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductDtoMapper
diff --git a/example/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt b/example/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt
index a7a3ecd1e1..c12d71b49f 100644
--- a/example/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt
+++ b/example/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt
@@ -27,7 +27,7 @@ import org.wordpress.android.fluxc.model.AccountModel
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.ProductWithMetaData
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.WCProductCategoryModel
 import org.wordpress.android.fluxc.model.WCProductModel
 import org.wordpress.android.fluxc.model.WCProductReviewModel
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt
index 68c3dd2009..0c0ae19b9b 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt
@@ -1,5 +1,7 @@
 package org.wordpress.android.fluxc.model
 
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
 data class OrderAttributionInfo(
     val sourceType: String? = null,
     val campaign: String? = null,
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt
index f98d845941..1bb26936af 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt
@@ -7,6 +7,7 @@ import androidx.room.TypeConverters
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.order.CouponLine
 import org.wordpress.android.fluxc.model.order.FeeLine
 import org.wordpress.android.fluxc.model.order.LineItem
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt
index cacd22b1b3..ba3112ad78 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt
@@ -1,5 +1,7 @@
 package org.wordpress.android.fluxc.model
 
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
 data class ProductWithMetaData(
     val product: WCProductModel,
     val metaData: List<WCMetaData> = emptyList()
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt
index b2a624dc45..70f14fff3f 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt
@@ -1,7 +1,8 @@
 package org.wordpress.android.fluxc.model
 
-import org.wordpress.android.fluxc.model.WCMetaData.AddOnsMetadataKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.AddOnsMetadataKeys
 import org.wordpress.android.fluxc.model.WCProductModel.SubscriptionMetadataKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import javax.inject.Inject
 
 class StripProductMetaData @Inject internal constructor() {
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt
index 7a1c08809d..78204d4931 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.fluxc.model
 import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.utils.isElementNullOrEmpty
 import javax.inject.Inject
 
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt
index f339582386..1b19eacf0e 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt
@@ -2,7 +2,7 @@ package org.wordpress.android.fluxc.model.addons
 
 import com.google.gson.Gson
 import com.google.gson.annotations.SerializedName
-import org.wordpress.android.fluxc.model.WCMetaDataValue
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
 
 data class RemoteAddonDto(
     @SerializedName("title_format")
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetaDataParentItemType.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetaDataParentItemType.kt
new file mode 100644
index 0000000000..daa30be096
--- /dev/null
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetaDataParentItemType.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.metadata
+
+enum class MetaDataParentItemType {
+    ORDER,
+    PRODUCT
+}
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/UpdateMetadataRequest.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/UpdateMetadataRequest.kt
new file mode 100644
index 0000000000..978bb7e73a
--- /dev/null
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/UpdateMetadataRequest.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.model.metadata
+
+data class UpdateMetadataRequest(
+    val parentItemId: Long,
+    val parentItemType: MetaDataParentItemType,
+    val insertedMetadata: List<WCMetaData> = emptyList(),
+    val updatedMetadata: List<WCMetaData> = emptyList(),
+    val deletedMetadata: List<WCMetaData> = emptyList(),
+) {
+    init {
+        // The ID of inserted metadata is ignored, so to ensure that there is no data loss here,
+        // we require that all inserted metadata have an ID of 0.
+        require(insertedMetadata.all { it.id == 0L }) {
+            "Inserted metadata must have an ID of 0"
+        }
+    }
+}
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCMetaData.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaData.kt
similarity index 87%
rename from plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCMetaData.kt
rename to plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaData.kt
index 09417e558a..b62869363b 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCMetaData.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaData.kt
@@ -1,10 +1,12 @@
-package org.wordpress.android.fluxc.model
+package org.wordpress.android.fluxc.model.metadata
 
-import androidx.annotation.VisibleForTesting
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue.JsonArrayValue
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue.JsonObjectValue
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue.WCMetaDataValueJsonAdapter
 import org.wordpress.android.util.AppLog
 
 data class WCMetaData(
@@ -12,16 +14,18 @@ data class WCMetaData(
     val id: Long,
     @SerializedName(KEY)
     val key: String,
-    @JsonAdapter(WCMetaDataValue.WCMetaDataValueJsonAdapter::class)
+    @JsonAdapter(WCMetaDataValueJsonAdapter::class)
     @SerializedName(VALUE)
     val value: WCMetaDataValue,
     @SerializedName(DISPLAY_KEY)
     val displayKey: String? = null,
-    @JsonAdapter(WCMetaDataValue.WCMetaDataValueJsonAdapter::class)
+    @JsonAdapter(WCMetaDataValueJsonAdapter::class)
     @SerializedName(DISPLAY_VALUE)
     val displayValue: WCMetaDataValue? = null
 ) {
-    constructor(id: Long, key: String, value: String) : this(id, key, WCMetaDataValue.fromRawString(value))
+    constructor(id: Long, key: String, value: String) : this(id, key,
+        WCMetaDataValue.fromRawString(value)
+    )
 
     /**
      * Verify if the Metadata key is not null or a internal store attribute
@@ -41,7 +45,7 @@ data class WCMetaData(
         get() = valueAsString.contains(htmlRegex)
 
     val isJson: Boolean
-        get() = value is WCMetaDataValue.JsonObjectValue || value is WCMetaDataValue.JsonArrayValue
+        get() = value is JsonObjectValue || value is JsonArrayValue
 
     internal fun toJson(): JsonObject {
         return JsonObject().also {
@@ -54,7 +58,6 @@ data class WCMetaData(
     }
 
     companion object {
-        @VisibleForTesting
         const val ID = "id"
         const val KEY = "key"
         const val VALUE = "value"
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCMetaDataValue.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaDataValue.kt
similarity index 98%
rename from plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCMetaDataValue.kt
rename to plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaDataValue.kt
index 9e484d52d3..cce8c27c11 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCMetaDataValue.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaDataValue.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.fluxc.model
+package org.wordpress.android.fluxc.model.metadata
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonDeserializationContext
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt
index 7ca3f9f186..4f4cd33341 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt
@@ -2,8 +2,8 @@ package org.wordpress.android.fluxc.model.order
 
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import org.wordpress.android.fluxc.model.WCMetaData
-import org.wordpress.android.fluxc.model.get
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.get
 import org.wordpress.android.fluxc.utils.JsonElementToLongSerializerDeserializer
 
 data class LineItem(
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt
index 65580685f2..45a3475ebc 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt
@@ -1,7 +1,7 @@
 package org.wordpress.android.fluxc.model.refunds
 
 import com.google.gson.annotations.SerializedName
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import java.math.BigDecimal
 import java.util.Date
 
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/metadata/MetaDataRestClient.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/metadata/MetaDataRestClient.kt
new file mode 100644
index 0000000000..8f104740e2
--- /dev/null
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/metadata/MetaDataRestClient.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.metadata
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonNull
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+internal class MetaDataRestClient @Inject internal constructor(
+    private val wooNetwork: WooNetwork
+) {
+    suspend fun fetchMetaData(
+        site: SiteModel,
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType
+    ): WooPayload<List<WCMetaData>> {
+        val path = when (parentItemType) {
+            MetaDataParentItemType.ORDER -> WOOCOMMERCE.orders.id(parentItemId).pathV3
+            MetaDataParentItemType.PRODUCT -> WOOCOMMERCE.products.id(parentItemId).pathV3
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = path,
+            params = mapOf("_fields" to "meta_data"),
+            clazz = JsonObject::class.java
+        )
+
+        return response.toWooPayload {
+            it.extractMetaData()
+        }
+    }
+
+    suspend fun updateMetaData(
+        site: SiteModel,
+        request: UpdateMetadataRequest
+    ): WooPayload<List<WCMetaData>> {
+        val path = when (request.parentItemType) {
+            MetaDataParentItemType.ORDER -> WOOCOMMERCE.orders.id(request.parentItemId).pathV3
+            MetaDataParentItemType.PRODUCT -> WOOCOMMERCE.products.id(request.parentItemId).pathV3
+        }
+
+        val metaDataJson = JsonArray()
+        request.insertedMetadata.forEach {
+            metaDataJson.add(
+                JsonObject().apply {
+                    addProperty(WCMetaData.KEY, it.key)
+                    add(WCMetaData.VALUE, it.value.jsonValue)
+                }
+            )
+        }
+        request.updatedMetadata.forEach {
+            metaDataJson.add(it.toJson())
+        }
+        request.deletedMetadata.forEach {
+            metaDataJson.add(
+                JsonObject().apply {
+                    addProperty(WCMetaData.ID, it.id)
+                    add(WCMetaData.VALUE, JsonNull.INSTANCE)
+                }
+            )
+        }
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = path,
+            body = mapOf(
+                "meta_data" to metaDataJson,
+                "_fields" to "meta_data"
+            ),
+            clazz = JsonObject::class.java
+        )
+
+        return response.toWooPayload {
+            it.extractMetaData()
+        }
+    }
+
+    private fun JsonObject.extractMetaData() = getAsJsonArray("meta_data").mapNotNull {
+        WCMetaData.fromJson(it)
+    }
+}
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt
index 98c15424d6..a944c9ebfc 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt
@@ -5,7 +5,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
 import org.wordpress.android.fluxc.model.OrderEntity
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.order.OrderAddress
 import org.wordpress.android.fluxc.utils.DateUtils
 import java.math.BigDecimal
@@ -89,7 +89,7 @@ class OrderDtoMapper @Inject internal constructor(
             )
         }
 
-        val strippedMetaData = stripOrderMetaData.invoke(orderDto)
+        val strippedMetaData = stripOrderMetaData.invoke(rawRemoteDataEntity.metaData)
 
         return stripOrder(rawRemoteDataEntity) to strippedMetaData
     }
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt
index 911274a915..e0f5c4729b 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt
@@ -10,8 +10,8 @@ import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.OrderEntity
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.WCMetaData
-import org.wordpress.android.fluxc.model.WCMetaData.OrderAttributionInfoKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.OrderAttributionInfoKeys
 import org.wordpress.android.fluxc.model.WCOrderListDescriptor
 import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
 import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt
index c8f4a06cf6..3b5b514483 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt
@@ -2,7 +2,7 @@ package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
 
 import com.google.gson.Gson
 import org.wordpress.android.fluxc.model.OrderEntity
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.order.LineItem
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.CHARGE_ID_KEY
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.RECEIPT_URL_KEY
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt
index a8774dacbe..c388b278d7 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt
@@ -1,28 +1,14 @@
 package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
 
-import com.google.gson.Gson
-import com.google.gson.JsonElement
-import com.google.gson.reflect.TypeToken
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import javax.inject.Inject
 
-class StripOrderMetaData @Inject internal constructor(private val gson: Gson) {
-    private val type = object : TypeToken<List<WCMetaData>>() {}.type
-
-    operator fun invoke(orderDto: OrderDto): List<WCMetaData> {
-        return parseMetaDataJSON(orderDto.meta_data)
-            ?.filter {
+class StripOrderMetaData @Inject internal constructor() {
+    operator fun invoke(metaData: List<WCMetaData>): List<WCMetaData> {
+        return metaData
+            .filter {
                 (it.isDisplayable || it.key in WCMetaData.SUPPORTED_KEYS)
                         && !it.isJson
             }
-            ?: emptyList()
-    }
-
-    private fun parseMetaDataJSON(metadata: JsonElement?): List<WCMetaData>? {
-        return metadata?.let {
-            gson.runCatching {
-                fromJson<List<WCMetaData>?>(metadata, type)
-            }.getOrNull()
-        }
     }
 }
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt
index cf70b41915..ea5e7823d4 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt
@@ -4,7 +4,7 @@ import com.google.gson.Gson
 import org.wordpress.android.fluxc.model.LocalOrRemoteId
 import org.wordpress.android.fluxc.model.ProductWithMetaData
 import org.wordpress.android.fluxc.model.StripProductMetaData
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.WCProductModel
 import org.wordpress.android.fluxc.network.utils.getString
 import javax.inject.Inject
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt
index 7b1d9b9bf7..52ead0a625 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt
@@ -3,9 +3,10 @@ package org.wordpress.android.fluxc.persistence
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
 import org.wordpress.android.fluxc.model.ProductWithMetaData
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
 import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
 import javax.inject.Inject
@@ -36,13 +37,11 @@ class ProductStorageHelper @Inject constructor(
             parentItemId = product.remoteProductId,
             localSiteId = LocalId(product.localSiteId),
             metaData = metadata.map {
-                MetaDataEntity(
+                MetaDataEntity.fromDomainModel(
+                    metaData = it,
                     localSiteId = LocalId(product.localSiteId),
-                    id = it.id,
                     parentItemId = product.remoteProductId,
-                    key = it.key,
-                    value = it.valueAsString,
-                    type = MetaDataEntity.ParentItemType.PRODUCT
+                    parentItemType = MetaDataParentItemType.PRODUCT
                 )
             }
         )
@@ -61,13 +60,11 @@ class ProductStorageHelper @Inject constructor(
                 parentItemId = product.remoteProductId,
                 localSiteId = LocalId(product.localSiteId),
                 metaData = metadata.map {
-                    MetaDataEntity(
+                    MetaDataEntity.fromDomainModel(
+                        metaData = it,
                         localSiteId = LocalId(product.localSiteId),
-                        id = it.id,
                         parentItemId = product.remoteProductId,
-                        key = it.key,
-                        value = it.valueAsString,
-                        type = MetaDataEntity.ParentItemType.PRODUCT
+                        parentItemType = MetaDataParentItemType.PRODUCT
                     )
                 }
             )
@@ -88,6 +85,6 @@ class ProductStorageHelper @Inject constructor(
         withContext(Dispatchers.IO) {
             productSqlUtils.deleteProductsForSite(site)
         }
-        metaDataDao.deleteMetaDataForSite(site.localId(), MetaDataEntity.ParentItemType.PRODUCT)
+        metaDataDao.deleteMetaDataForSite(site.localId(), MetaDataParentItemType.PRODUCT)
     }
 }
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt
index 2e8b1ac29e..70dbd63d71 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt
@@ -4,7 +4,7 @@ import androidx.room.TypeConverter
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 
 internal class WCMetaDataConverter {
     @TypeConverter
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt
index ec7f7199ed..9ceb420bdc 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt
@@ -7,6 +7,7 @@ import androidx.room.Query
 import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
 import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
 
 @Dao
@@ -29,6 +30,20 @@ abstract class MetaDataDao {
         parentItemId: Long
     ): Flow<List<MetaDataEntity>>
 
+    @Query(
+        """
+        SELECT * FROM MetaData 
+        WHERE parentItemId = :parentItemId 
+        AND localSiteId = :localSiteId 
+        AND `key` NOT LIKE '\_%'
+        ESCAPE '\'
+        """
+    )
+    abstract fun observeDisplayableMetaData(
+        localSiteId: LocalId,
+        parentItemId: Long
+    ): Flow<List<MetaDataEntity>>
+
     @Query("SELECT * FROM MetaData WHERE id = :id AND parentItemId = :parentItemId AND localSiteId = :localSiteId")
     abstract suspend fun getMetaData(
         localSiteId: LocalId,
@@ -36,6 +51,13 @@ abstract class MetaDataDao {
         id: Long
     ): MetaDataEntity?
 
+    @Query("SELECT * FROM MetaData WHERE parentItemId = :parentItemId AND localSiteId = :localSiteId AND `key` = :key")
+    abstract suspend fun getMetaDataByKey(
+        localSiteId: LocalId,
+        parentItemId: Long,
+        key: String
+    ): List<MetaDataEntity>?
+
     @Query("""
         SELECT * FROM MetaData
         WHERE parentItemId = :parentItemId 
@@ -69,7 +91,7 @@ abstract class MetaDataDao {
     abstract suspend fun deleteMetaData(localSiteId: LocalId, parentItemId: Long)
 
     @Query("DELETE FROM MetaData WHERE localSiteId = :localSiteId AND type = :type")
-    abstract suspend fun deleteMetaDataForSite(localSiteId: LocalId, type: MetaDataEntity.ParentItemType)
+    abstract suspend fun deleteMetaDataForSite(localSiteId: LocalId, type: MetaDataParentItemType)
 
     @Transaction
     open suspend fun updateMetaData(
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt
index 9d2c7e2d42..2579386eb2 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt
@@ -3,7 +3,8 @@ package org.wordpress.android.fluxc.persistence.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 
 /**
  * The MetaDataEntity table is used to store viewable wordpress metadata. WordPress metadata
@@ -23,7 +24,7 @@ data class MetaDataEntity(
     val key: String,
     val value: String,
     @ColumnInfo(defaultValue = "ORDER") // We default to ORDER for backwards compatibility
-    val type: ParentItemType
+    val type: MetaDataParentItemType
 ) {
     fun toDomainModel() = WCMetaData(
         id = id,
@@ -31,8 +32,19 @@ data class MetaDataEntity(
         value = value
     )
 
-    enum class ParentItemType {
-        ORDER,
-        PRODUCT
+    companion object {
+        fun fromDomainModel(
+            metaData: WCMetaData,
+            localSiteId: LocalId,
+            parentItemId: Long,
+            parentItemType: MetaDataParentItemType
+        ) = MetaDataEntity(
+            localSiteId = localSiteId,
+            id = metaData.id,
+            parentItemId = parentItemId,
+            key = metaData.key,
+            value = metaData.value.jsonValue.toString(),
+            type = parentItemType
+        )
     }
 }
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt
index 33e4e45155..312302f614 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt
@@ -3,8 +3,9 @@ package org.wordpress.android.fluxc.store
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.ListActionBuilder
 import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
 import org.wordpress.android.fluxc.model.OrderEntity
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.WCOrderListDescriptor
 import org.wordpress.android.fluxc.persistence.TransactionExecutor
 import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
@@ -36,13 +37,11 @@ class InsertOrder @Inject internal constructor(
                     order.orderId,
                     order.localSiteId,
                     metaData.map {
-                        MetaDataEntity(
+                        MetaDataEntity.fromDomainModel(
+                            metaData = it,
                             localSiteId = order.localSiteId,
-                            id = it.id,
                             parentItemId = order.orderId,
-                            key = it.key,
-                            value = it.valueAsString,
-                            type = MetaDataEntity.ParentItemType.ORDER
+                            parentItemType = MetaDataParentItemType.ORDER
                         )
                     }
                 )
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/MetaDataStore.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/MetaDataStore.kt
new file mode 100644
index 0000000000..729a5255bc
--- /dev/null
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/MetaDataStore.kt
@@ -0,0 +1,131 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.StripProductMetaData
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.metadata.MetaDataRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.StripOrderMetaData
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MetaDataStore @Inject internal constructor(
+    private val metaDataRestClient: MetaDataRestClient,
+    private val metaDataDao: MetaDataDao,
+    private val stripProductMetaData: StripProductMetaData,
+    private val stripOrderMetaData: StripOrderMetaData
+) {
+    suspend fun updateMetaData(
+        site: SiteModel,
+        request: UpdateMetadataRequest
+    ): WooResult<Unit> {
+        val result = metaDataRestClient.updateMetaData(site, request)
+
+        result.result?.let {
+            persistMetaData(
+                site = site,
+                parentItemId = request.parentItemId,
+                parentItemType = request.parentItemType,
+                metaDataList = it
+            )
+        }
+
+        @Suppress("RedundantUnitExpression")
+        return result.asWooResult { Unit }
+    }
+
+    suspend fun refreshMetaData(
+        site: SiteModel,
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType
+    ): WooResult<Unit> {
+        val result = metaDataRestClient.fetchMetaData(site, parentItemId, parentItemType)
+
+        result.result?.let {
+            persistMetaData(
+                site = site,
+                parentItemId = parentItemId,
+                parentItemType = parentItemType,
+                metaDataList = it
+            )
+        }
+
+        @Suppress("RedundantUnitExpression")
+        return result.asWooResult { Unit }
+    }
+
+    private suspend fun persistMetaData(
+        site: SiteModel,
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType,
+        metaDataList: List<WCMetaData>
+    ) {
+        val filteredValues = when (parentItemType) {
+            MetaDataParentItemType.ORDER -> stripOrderMetaData(metaDataList)
+            MetaDataParentItemType.PRODUCT -> stripProductMetaData(metaDataList)
+        }
+
+        metaDataDao.updateMetaData(
+            localSiteId = site.localId(),
+            parentItemId = parentItemId,
+            metaData = filteredValues.map { metaData ->
+                MetaDataEntity.fromDomainModel(
+                    metaData = metaData,
+                    localSiteId = site.localId(),
+                    parentItemId = parentItemId,
+                    parentItemType = parentItemType
+                )
+            }
+        )
+    }
+
+    fun observeMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.observeMetaData(site.localId(), parentItemId)
+        .map { list -> list.map { it.toDomainModel() } }
+
+    fun observeDisplayableMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.observeDisplayableMetaData(site.localId(), parentItemId)
+        .map { list -> list.map { it.toDomainModel() } }
+
+    suspend fun getMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.getMetaData(site.localId(), parentItemId).map { it.toDomainModel() }
+
+    suspend fun getDisplayableMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.getDisplayableMetaData(site.localId(), parentItemId).map { it.toDomainModel() }
+
+    suspend fun getMetaDataById(
+        site: SiteModel,
+        parentItemId: Long,
+        metaDataId: Long
+    ) = metaDataDao.getMetaData(
+        localSiteId = site.localId(),
+        parentItemId = parentItemId,
+        id = metaDataId
+    )
+        ?.toDomainModel()
+
+    suspend fun getMetaDataByKey(
+        site: SiteModel,
+        parentItemId: Long,
+        key: String
+    ) = metaDataDao.getMetaDataByKey(site.localId(), parentItemId, key)?.map { it.toDomainModel() }
+
+    suspend fun hasDisplayableMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.getDisplayableMetaDataCount(site.localId(), parentItemId) > 0
+}
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt
index 81684508b2..e540b69820 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt
@@ -15,7 +15,7 @@ import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.OrderEntity
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.WCOrderListDescriptor
 import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
 import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
diff --git a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt
index 0989e33598..49f1df6c5d 100644
--- a/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt
+++ b/plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt
@@ -15,7 +15,7 @@ import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.ProductWithMetaData
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.VariationAttributes
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.model.WCProductCategoryModel
 import org.wordpress.android.fluxc.model.WCProductComponent
 import org.wordpress.android.fluxc.model.WCProductImageModel
@@ -26,7 +26,7 @@ import org.wordpress.android.fluxc.model.WCProductTagModel
 import org.wordpress.android.fluxc.model.WCProductVariationModel
 import org.wordpress.android.fluxc.model.WCProductVariationModel.ProductVariantOption
 import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
-import org.wordpress.android.fluxc.model.get
+import org.wordpress.android.fluxc.model.metadata.get
 import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
 import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
 import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt
index 11deb8cce9..ac8ee73388 100644
--- a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt
@@ -5,9 +5,10 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.wordpress.android.fluxc.model.WCMetaData.Companion.ID
-import org.wordpress.android.fluxc.model.WCMetaData.Companion.KEY
-import org.wordpress.android.fluxc.model.WCMetaData.Companion.VALUE
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.Companion.ID
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.Companion.KEY
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.Companion.VALUE
 
 @RunWith(RobolectricTestRunner::class)
 class WCMetaDataTest {
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt
index 52a9cdb320..0a04373d3a 100644
--- a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.fluxc.model
 
 import org.junit.Test
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
 
 class WCMetaDataValueTest {
     @Test
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt
index f92846ec4d..4e3c4e8548 100644
--- a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt
@@ -1,37 +1,16 @@
 package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
 
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import com.google.gson.reflect.TypeToken
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
-import org.mockito.kotlin.mock
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 
 class StripOrderMetaDataTest {
     private lateinit var sut: StripOrderMetaData
-    private lateinit var orderDtoMock: OrderDto
-    private lateinit var gsonMock: Gson
-    private val jsonObjectMock = mock<JsonObject>()
 
     @Before
     fun setUp() {
-        configureMocks()
-        sut = StripOrderMetaData(gsonMock)
-    }
-
-    private fun configureMocks() {
-        orderDtoMock = mock {
-            on { id }.thenReturn(1)
-            on { meta_data }.thenReturn(jsonObjectMock)
-        }
-        gsonMock = mock {
-            val responseType = object : TypeToken<List<WCMetaData>>() {}.type
-            on { fromJson<List<WCMetaData>?>(jsonObjectMock, responseType) }.thenReturn(
-                listOf()
-            )
-        }
+        sut = StripOrderMetaData()
     }
 
     @Test
@@ -49,16 +28,9 @@ class StripOrderMetaDataTest {
                 value = "valid value"
             )
         )
-        gsonMock = mock {
-            val responseType = object : TypeToken<List<WCMetaData>>() {}.type
-            on { fromJson<List<WCMetaData>?>(jsonObjectMock, responseType) }.thenReturn(
-                rawMetadata
-            )
-        }
-        sut = StripOrderMetaData(gsonMock)
 
         // When
-        val result: List<WCMetaData> = sut(orderDtoMock)
+        val result: List<WCMetaData> = sut(rawMetadata)
 
         // Then
         assertThat(result).isEqualTo(
@@ -72,38 +44,6 @@ class StripOrderMetaDataTest {
         )
     }
 
-    @Test
-    fun `when orderDto has no id, then cancel the operation`() {
-        // Given
-        orderDtoMock = mock {
-            on { id }.thenReturn(null)
-        }
-
-        // When
-        val result = sut(orderDtoMock)
-
-        // Then
-        assertThat(result).isEmpty()
-    }
-
-    @Test
-    fun `when JSON parsing fails, then set an empty metadata list`() {
-        // Given
-        gsonMock = mock {
-            val responseType = object : TypeToken<List<WCMetaData>>() {}.type
-            on { fromJson<List<WCMetaData>?>(jsonObjectMock, responseType) }.thenThrow(
-                IllegalStateException()
-            )
-        }
-        sut = StripOrderMetaData(gsonMock)
-
-        // When
-        val result = sut(orderDtoMock)
-
-        // Then
-        assertThat(result).isEmpty()
-    }
-
     @Test
     fun `when Metadata value contains JSON, then remove it from the list`() {
         // Given
@@ -119,16 +59,9 @@ class StripOrderMetaDataTest {
                 value = "valid value"
             )
         )
-        gsonMock = mock {
-            val responseType = object : TypeToken<List<WCMetaData>>() {}.type
-            on { fromJson<List<WCMetaData>?>(jsonObjectMock, responseType) }.thenReturn(
-                rawMetadata
-            )
-        }
-        sut = StripOrderMetaData(gsonMock)
 
         // When
-        val result = sut(orderDtoMock)
+        val result = sut(rawMetadata)
 
         // Then
         assertThat(result).isEqualTo(
@@ -157,16 +90,9 @@ class StripOrderMetaDataTest {
                 value = "valid value"
             )
         )
-        gsonMock = mock {
-            val responseType = object : TypeToken<List<WCMetaData>>() {}.type
-            on { fromJson<List<WCMetaData>?>(jsonObjectMock, responseType) }.thenReturn(
-                rawMetadata
-            )
-        }
-        sut = StripOrderMetaData(gsonMock)
 
         // When
-        val result = sut(orderDtoMock)
+        val result = sut(rawMetadata)
 
         // Then
         assertThat(result).isEqualTo(
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt
index af3b0a4ef8..d615e0b183 100644
--- a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt
@@ -7,7 +7,7 @@ import org.junit.Before
 import org.junit.Test
 import org.wordpress.android.fluxc.model.LocalOrRemoteId
 import org.wordpress.android.fluxc.model.OrderEntity
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.CHARGE_ID_KEY
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.RECEIPT_URL_KEY
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.SHIPPING_PHONE_KEY
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt
index 581d4dd9d1..a76141ba6f 100644
--- a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt
@@ -5,9 +5,9 @@ import com.google.gson.JsonPrimitive
 import org.assertj.core.api.Assertions
 import org.junit.Test
 import org.wordpress.android.fluxc.model.StripProductMetaData
-import org.wordpress.android.fluxc.model.WCMetaData
-import org.wordpress.android.fluxc.model.WCMetaData.AddOnsMetadataKeys
-import org.wordpress.android.fluxc.model.WCMetaDataValue
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.AddOnsMetadataKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
 import org.wordpress.android.fluxc.model.WCProductModel.SubscriptionMetadataKeys
 
 class StripProductMetaDataTest {
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt
index afb37b9bdb..c9ec0eb354 100644
--- a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt
@@ -6,7 +6,7 @@ import com.google.gson.JsonObject
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.wordpress.android.fluxc.model.StripProductVariationMetaData
-import org.wordpress.android.fluxc.model.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
 
 class StripProductVariationMetaDataTest {
     private val gson = Gson()
diff --git a/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/store/MetaDataStoreTest.kt b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/store/MetaDataStoreTest.kt
new file mode 100644
index 0000000000..b2bfc824ac
--- /dev/null
+++ b/plugins/woocommerce/src/test/java/org/wordpress/android/fluxc/store/MetaDataStoreTest.kt
@@ -0,0 +1,150 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.test.runTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameter
+import org.junit.runners.Parameterized.Parameters
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.StripProductMetaData
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.metadata.MetaDataRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.StripOrderMetaData
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+
+@RunWith(Parameterized::class)
+class MetaDataStoreTest {
+    private lateinit var metaDataStore: MetaDataStore
+    private val metaDataRestClient: MetaDataRestClient = mock()
+    private val metaDataDao: MetaDataDao = mock()
+    private val stripProductMetaData = StripProductMetaData()
+    private val stripOrderMetaData = StripOrderMetaData()
+
+    @Parameter
+    lateinit var parentItemType: MetaDataParentItemType
+
+    private val site = SiteModel()
+
+    @Before
+    fun setUp() {
+        metaDataStore = MetaDataStore(
+            metaDataRestClient = metaDataRestClient,
+            metaDataDao = metaDataDao,
+            stripProductMetaData = stripProductMetaData,
+            stripOrderMetaData = stripOrderMetaData
+        )
+    }
+
+    @Test
+    fun `when updating order metadata successfully, then persist metadata`() = runTest {
+        val request = UpdateMetadataRequest(
+            parentItemId = 1,
+            parentItemType = parentItemType,
+            insertedMetadata = listOf(WCMetaData(0, "key", "value"))
+        )
+        val payload = WooPayload(
+            listOf(
+                WCMetaData(1, "key", "value"),
+                WCMetaData(2, "_key", "value2") // should be stripped
+            )
+        )
+        whenever(metaDataRestClient.updateMetaData(site, request)).thenReturn(payload)
+
+        val result = metaDataStore.updateMetaData(site, request)
+
+        assertThat(result).isEqualTo(WooResult(Unit))
+        verify(metaDataDao).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = parentItemType.stripper(payload.result!!).map {
+                MetaDataEntity.fromDomainModel(it, site.localId(), 1, parentItemType)
+            }
+        )
+    }
+
+    @Test
+    fun `when refreshing metadata succeeds, then persist metadata`() = runTest {
+        val payload = WooPayload(
+            listOf(
+                WCMetaData(1, "key", "value"),
+                WCMetaData(2, "_key", "value2") // should be stripped
+            )
+        )
+        whenever(metaDataRestClient.fetchMetaData(site, 1, parentItemType))
+            .thenReturn(payload)
+
+        val result = metaDataStore.refreshMetaData(site, 1, parentItemType)
+
+        assertThat(result).isEqualTo(WooResult(Unit))
+        verify(metaDataDao).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = parentItemType.stripper(payload.result!!).map {
+                MetaDataEntity.fromDomainModel(it, site.localId(), 1, parentItemType)
+            }
+        )
+    }
+
+    @Test
+    fun `when updating metadata fails, then do not persist metadata`() = runTest {
+        val request = UpdateMetadataRequest(
+            parentItemId = 1,
+            parentItemType = parentItemType,
+            insertedMetadata = listOf(WCMetaData(0, "key", "value"))
+        )
+        val error = WooError(type = WooErrorType.GENERIC_ERROR, original = GenericErrorType.UNKNOWN)
+        whenever(metaDataRestClient.updateMetaData(site, request)).thenReturn(WooPayload(error))
+
+        val result = metaDataStore.updateMetaData(site, request)
+
+        assertThat(result).isEqualTo(WooResult<Unit>(error))
+        verify(metaDataDao, never()).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = emptyList()
+        )
+    }
+
+    @Test
+    fun `when refreshing metadata fails, then do not persist metadata`() = runTest {
+        val error = WooError(type = WooErrorType.GENERIC_ERROR, original = GenericErrorType.UNKNOWN)
+        whenever(metaDataRestClient.fetchMetaData(site, 1, parentItemType))
+            .thenReturn(WooPayload(error))
+
+        val result = metaDataStore.refreshMetaData(site, 1, parentItemType)
+
+        assertThat(result).isEqualTo(WooResult<Unit>(error))
+        verify(metaDataDao, never()).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = emptyList()
+        )
+    }
+
+    private val MetaDataParentItemType.stripper
+        get() = when (this) {
+            MetaDataParentItemType.ORDER -> stripOrderMetaData::invoke
+            MetaDataParentItemType.PRODUCT -> stripProductMetaData::invoke
+        }
+
+    companion object {
+        @JvmStatic
+        @Parameters
+        fun data() = MetaDataParentItemType.entries
+    }
+}