Fix UCD Caching Regression