Revamped cache to update entities upon a subsequent fetch and yet expire them after a capped limit is hit. Also, some minor changes on refresh of icons in the map.