Added caching using map_finished