New version to add the cache