Fix to save having to look up values that have already been looked up before.