Fix #3441, 'Visited' not saved for own waypoints

To disambiguate own waypoints in merge, generate a unique prefix on addition to the cache