Cleanup
fixed caching bug