fixed caching
cleanups