Added all cache tests and fixed caching once for all