Generalized the Cache structure, working towards caching of proxies as
well.
More "Factory"->"Host" translations