Moved all cache related functionality to storage classes. Fixes #16 and #9.