Get rid of unnatural use of artifact cache class.