Improves compatibility with other cache implementations and caching of the basket