Make the forever cache more reliable