Added some caching components