Re-enable Scaffold caching