Remove map caching.

Rather ugly hack made redundant by numpy stuff.