Caching for EWAR Targets, small bugfix for navigation