Fixed some caching causing crash