### What's the new feature? Properly handle #561 to permit caching. ### What value does this add? Allows proper caching. ### Is there an alternative you've considered? _No response_ ### Additional context _No response_