mapper: added cache support