Cache a little more to prevent repeats on crashes