POI map refresh update

+ Updates to optimise poi related map updates
+ Fixes for request caching not respecting cache overrides