Added host caching
a bit of design