Cache data not name and ver

So many red lines!  Oh the humanity!

1. Remove the unnecessary unpack/repack in the cache folder population.
2. Send the full package metadata object to the cache `add*` functions, rather than just the name & version.