v2 - added cache of locations