Mapper Caching
Closes T103