changed some caching behavior