Simplified a couple of places to use cached API capabilities
Simplified a couple of places to use cached API capabilities

perrito666/juju,waigani/juju,mjs/juju,frankban/juju,gabriel-samfira/juju,davecheney/juju,mjs/juju,dimitern/juju,ericsnowcurrently/juju,dooferlad/juju,howbazaar/juju,alesstimec/juju,gabriel-samfira/juju,mikemccracken/juju,axw/juju,bac/juju,waigani/juju,howbazaar/juju,bz2/juju,alesstimec/juju,ericsnowcurrently/juju,mjs/juju,mjs/juju,dimitern/juju,kat-co/juju,macgreagoir/juju,macgreagoir/juju,ericsnowcurrently/juju,anastasiamac/juju,axw/juju,frankban/juju,anastasiamac/juju,gabriel-samfira/juju,bogdanteleaga/juju,axw/juju,reedobrien/juju,dooferlad/juju,bz2/juju,mjs/juju,AdamIsrael/juju,bz2/juju,makyo/juju,dimitern/juju,bz2/juju,frankban/juju,axw/juju,davecheney/juju,bac/juju,bz2/juju,howbazaar/juju,alesstimec/juju,kat-co/juju,mikemccracken/juju,macgreagoir/juju,mjs/juju,dooferlad/juju,frankban/juju,howbazaar/juju,bogdanteleaga/juju,macgreagoir/juju,dimitern/juju,howbazaar/juju,davecheney/juju,dimitern/juju,reedobrien/juju,axw/juju,mikemccracken/juju,dooferlad/juju,bogdanteleaga/juju,waigani/juju,marcmolla/juju,kat-co/juju,marcmolla/juju,mjs/juju,mikemccracken/juju,reedobrien/juju,makyo/juju,marcmolla/juju,gabriel-samfira/juju,marcmolla/juju,makyo/juju,AdamIsrael/juju,makyo/juju,anastasiamac/juju,ericsnowcurrently/juju,perrito666/juju,kat-co/juju,bogdanteleaga/juju,reedobrien/juju,perrito666/juju,AdamIsrael/juju,mikemccracken/juju,dooferlad/juju,frankban/juju,kat-co/juju,macgreagoir/juju,perrito666/juju,bac/juju,reedobrien/juju,gabriel-samfira/juju,anastasiamac/juju,AdamIsrael/juju,ericsnowcurrently/juju,anastasiamac/juju,bac/juju,bac/juju,perrito666/juju,waigani/juju,davecheney/juju,alesstimec/juju,marcmolla/juju,alesstimec/juju