Added logic to cache swing and option values across the end of a round