Made cachedAdminToken an Option
Added toggle for populating the x-catalog header
Append the WWW-Authenticate header rather than replace it