Extended the cache tetsting a bit.