Modified caching tests to allow for reruns