Missed these commits for runtime caching