Merge "Pass in code cache directory when creating a script group."