Handle non-TDH providers, better buffering