Started working on tests for caching functionality