Fixed issue with cache tag