Backport cachebuster fix from commencement. Closes #358.