Caching for packs #27

Not quite done with this, but getting closer!