Merge "[pm] use list caches instead of real lists when snapshotting"