Fix/map cache

Needs OP2/PyOP2#351