Got moving on some tests for caching functionality