Change where we cache the package finder to alleviate issue collecting hashes with multiple indexes.

Change where we cache the package finder to alleviate issue collecting hashes with multiple indexes. #3490