some fixes, some caching updates