Found a fix for this specific issue, will raise ticket for general mutable cache entries issues