Change previous references to use cached versions