removing some caching