bux fixes to caching