Get rid of mappingDict, which was pretty much the same as cache
Use "Dict" instead of "Cache"