remove unused threading stuff
add caching