fixed some caching