extra caching test + fixes