Version supporting buffering using epoch from slave