More robust CAP management and CAP multi-prefix support