Spread the ArtifactCache further into the Code