Revert "Fix up exports"

This reverts commit bce76b800cd116fd7f75dedba540e8fe7626e657.
Revert "Remove redundant cache code, rename files, tie everything in"

This reverts commit f96a540c97eb63b9360fb0c254869cd745c8ac99.