test collection models
cache client name and roles
prefetch resource
minor fixes