Add caching for recent mappings