add metadata fields to cache the result of doing the metadata splitting
update the way the metadata is collected