turn off caching

and small cleanups