Better caching - though now all map records need to be read into memory.