diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt
index 1920f3d58..8808b17ae 100644
--- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt
+++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/ComponentDataExtractor.kt
@@ -107,7 +107,7 @@ object ComponentDataExtractor {
     val metadata = MetadataRegister.get(namespace, key)
     val identifier =
         metadata?.id
-            ?: MetadataRegister.registerDynamic(
+            ?: MetadataRegister.register(
                 MetadataRegister.TYPE_ATTRIBUTE, namespace, key, mutable, possibleValues)
     return identifier
   }
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/UIDebuggerFlipperPlugin.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/UIDebuggerFlipperPlugin.kt
index b5bf9ae54..f725c80f7 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/UIDebuggerFlipperPlugin.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/UIDebuggerFlipperPlugin.kt
@@ -59,7 +59,7 @@ class UIDebuggerFlipperPlugin(
         MetadataUpdateEvent.name,
         Json.encodeToString(
             MetadataUpdateEvent.serializer(),
-            MetadataUpdateEvent(MetadataRegister.staticMetadata())))
+            MetadataUpdateEvent(MetadataRegister.getPendingMetadata())))
 
     context.treeObserverManager.start()
   }
@@ -69,7 +69,7 @@ class UIDebuggerFlipperPlugin(
     this.context.connectionRef.connection = null
     Log.i(LogTag, "Disconnected")
 
-    MetadataRegister.clear()
+    MetadataRegister.reset()
 
     context.treeObserverManager.stop()
     context.bitmapPool.recycleAll()
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/NativeScanScheduler.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/NativeScanScheduler.kt
index 53eb74d07..6223aa511 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/NativeScanScheduler.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/NativeScanScheduler.kt
@@ -54,7 +54,7 @@ class NativeScanScheduler(val context: Context) : Scheduler.Task<ScanResult> {
   }
 
   private fun sendMetadata() {
-    val metadata = MetadataRegister.dynamicMetadata()
+    val metadata = MetadataRegister.getPendingMetadata()
     if (metadata.size > 0) {
       context.connectionRef.connection?.send(
           MetadataUpdateEvent.name,
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentFrameworkDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentFrameworkDescriptor.kt
index 88570b9f8..136317ef7 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentFrameworkDescriptor.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentFrameworkDescriptor.kt
@@ -42,8 +42,7 @@ class FragmentFrameworkDescriptor(val register: DescriptorRegister) :
     for (key in args.keySet()) {
       val metadata = MetadataRegister.get(NAMESPACE, key)
       val identifier =
-          metadata?.id
-              ?: MetadataRegister.registerDynamic(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, key)
+          metadata?.id ?: MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, key)
 
       when (val value = args[key]) {
         is Number -> props[identifier] = InspectableValue.Number(value)
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentSupportDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentSupportDescriptor.kt
index 593f51461..a45f9409e 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentSupportDescriptor.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/FragmentSupportDescriptor.kt
@@ -42,7 +42,7 @@ class FragmentSupportDescriptor(val register: DescriptorRegister) :
         val metadata = MetadataRegister.get(NAMESPACE, key)
         val identifier =
             metadata?.id
-                ?: MetadataRegister.registerDynamic(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, key)
+                ?: MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, key)
         when (val value = bundle[key]) {
           is Number -> props[identifier] = InspectableValue.Number(value)
           is Boolean -> props[identifier] = InspectableValue.Boolean(value)
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt
index 5282d28c4..55a780b07 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt
@@ -24,29 +24,10 @@ object MetadataRegister {
   const val TYPE_DOCUMENTATION = "documentation"
 
   private var generator: MetadataId = 0
-  private val staticMetadata: MutableMap<String, Metadata> = mutableMapOf()
-  private val dynamicMetadata: MutableMap<String, Metadata> = mutableMapOf()
-  private val queried: MutableSet<MetadataId> = mutableSetOf()
+  private val register: MutableMap<String, Metadata> = mutableMapOf()
+  private val pending: MutableSet<String> = mutableSetOf()
 
-  fun key(namespace: String, name: String): String = "${namespace}_$name"
-
-  private fun register(
-      metadata: MutableMap<String, Metadata>,
-      type: String,
-      namespace: String,
-      name: String,
-      mutable: Boolean,
-      possibleValues: Set<InspectableValue>?
-  ): MetadataId {
-    val key = key(namespace, name)
-    metadata[key]?.let { m ->
-      return m.id
-    }
-
-    val identifier = ++generator
-    metadata[key] = Metadata(identifier, type, namespace, name, mutable, possibleValues)
-    return identifier
-  }
+  private fun key(namespace: String, name: String): String = "${namespace}_$name"
 
   fun register(
       type: String,
@@ -55,46 +36,43 @@ object MetadataRegister {
       mutable: Boolean = false,
       possibleValues: Set<InspectableValue>? = emptySet()
   ): MetadataId {
-    return register(staticMetadata, type, namespace, name, mutable, possibleValues)
-  }
+    val key = key(namespace, name)
+    register[key]?.let { m ->
+      return m.id
+    }
 
-  fun registerDynamic(
-      type: String,
-      namespace: String,
-      name: String,
-      mutable: Boolean = false,
-      possibleValues: Set<InspectableValue>? = emptySet()
-  ): MetadataId {
-    return register(dynamicMetadata, type, namespace, name, mutable, possibleValues)
+    val identifier = ++generator
+    val metadata = Metadata(identifier, type, namespace, name, mutable, possibleValues)
+
+    register[key] = metadata
+    pending.add(key)
+
+    return identifier
   }
 
   fun get(namespace: String, name: String): Metadata? {
     val key = key(namespace, name)
-    staticMetadata[key]?.let {
-      return it
-    }
-    return dynamicMetadata[key]
+    return register[key]
   }
 
-  fun staticMetadata(): Map<MetadataId, Metadata> {
+  fun getMetadata(): Map<MetadataId, Metadata> {
     val metadata: MutableMap<MetadataId, Metadata> = mutableMapOf()
-    staticMetadata.forEach { entry -> metadata[entry.value.id] = entry.value }
-    return metadata
-  }
-
-  fun dynamicMetadata(): Map<MetadataId, Metadata> {
-    val metadata: MutableMap<MetadataId, Metadata> = mutableMapOf()
-    dynamicMetadata.forEach { entry ->
-      if (!queried.contains(entry.value.id)) {
-        metadata[entry.value.id] = entry.value
-        queried.add(entry.value.id)
-      }
-    }
+    register.forEach { entry -> metadata[entry.value.id] = entry.value }
 
     return metadata
   }
 
-  fun clear() {
-    queried.clear()
+  fun getPendingMetadata(): Map<MetadataId, Metadata> {
+    val pendingMetadata: MutableMap<MetadataId, Metadata> = mutableMapOf()
+    pending.forEach { key ->
+      register[key]?.let { metadata -> pendingMetadata[metadata.id] = metadata }
+    }
+
+    return pendingMetadata
+  }
+
+  fun reset() {
+    pending.clear()
+    register.forEach { entry -> pending.add(entry.key) }
   }
 }
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/WindowDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/WindowDescriptor.kt
index 60913a292..91a942274 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/WindowDescriptor.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/WindowDescriptor.kt
@@ -79,8 +79,7 @@ object WindowDescriptor : ChainedDescriptor<Window>() {
           val metadata = MetadataRegister.get(NAMESPACE, name)
           val identifier =
               metadata?.id
-                  ?: MetadataRegister.registerDynamic(
-                      MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, name)
+                  ?: MetadataRegister.register(MetadataRegister.TYPE_ATTRIBUTE, NAMESPACE, name)
 
           when (typedValue.type) {
             TypedValue.TYPE_STRING ->
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt
index 7c5502e92..2c088011a 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverManager.kt
@@ -90,7 +90,7 @@ class TreeObserverManager(val context: Context) {
   }
 
   private fun sendMetadata() {
-    val metadata = MetadataRegister.dynamicMetadata()
+    val metadata = MetadataRegister.getPendingMetadata()
     if (metadata.size > 0) {
       context.connectionRef.connection?.send(
           MetadataUpdateEvent.name,