catch-up and kafka (again)