fixing some caching