Followup r94502: per CR, use two caching variables instead of an array indexed with...