Caching category mapper, fixed bug