chore: use Map
s rather than objects as cache holders
#9902
Merged
Map
s rather than objects as cache holders
#9902