Merge "Defer RS cache creation until a ScriptC is built." into jb-mr2-dev