move everything around so test suite works
disable caching by default