Fixed some issue with the caching