Merge "Change the package cache to a SparseArrayMap."