better cap start/restart support