Added caching category mapper for future use