Modified so that generic will cache the map in the type map lists