Service cache sync fix

Change synchronisation code to explicitly handle service cache sync-ing such that local services are never sync'd from a remote source, and remote services always take precedence over those stored locally.