diff --git a/tools/aconfig/src/cache.rs b/tools/aconfig/src/cache.rs
index 20c5de5..94443d7 100644
--- a/tools/aconfig/src/cache.rs
+++ b/tools/aconfig/src/cache.rs
@@ -22,12 +22,19 @@
 use crate::commands::Source;
 
 #[derive(Serialize, Deserialize, Debug)]
+pub struct TracePoint {
+    pub source: Source,
+    pub state: FlagState,
+    pub permission: Permission,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
 pub struct Item {
     pub id: String,
     pub description: String,
     pub state: FlagState,
     pub permission: Permission,
-    pub debug: Vec<String>,
+    pub trace: Vec<TracePoint>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -63,7 +70,7 @@
             description: flag.description,
             state,
             permission,
-            debug: vec![format!("{}:{:?} {:?}", source, state, permission)],
+            trace: vec![TracePoint { source, state, permission }],
         });
         Ok(())
     }
@@ -74,9 +81,11 @@
         };
         existing_item.state = override_.state;
         existing_item.permission = override_.permission;
-        existing_item
-            .debug
-            .push(format!("{}:{:?} {:?}", source, override_.state, override_.permission));
+        existing_item.trace.push(TracePoint {
+            source,
+            state: override_.state,
+            permission: override_.permission,
+        });
         Ok(())
     }
 
diff --git a/tools/aconfig/src/commands.rs b/tools/aconfig/src/commands.rs
index dc3e6bc..73d3357 100644
--- a/tools/aconfig/src/commands.rs
+++ b/tools/aconfig/src/commands.rs
@@ -16,13 +16,14 @@
 
 use anyhow::{Context, Result};
 use clap::ValueEnum;
+use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::io::Read;
 
 use crate::aconfig::{Flag, Override};
 use crate::cache::Cache;
 
-#[derive(Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub enum Source {
     #[allow(dead_code)] // only used in unit tests
     Memory,