Tweak to meet OrgSync caching and inline-script needs