Removed extra caching of this