Changed to using cached versions of files