moar tests, cache fixes