cleanup + more caching