removed some logging, fixed caching bug