Added caching, improved handling of errors from upstream advert server, better fail safe content