Fixed issue with not caching correctly