Fix for round_end cache loss