Revert "Missed these commits for runtime caching"

This reverts commit 4c124a4b95f5ef4424bc20a71b83158427e7b97b.