cleanup
updated caching