Made cached values a little less awful.