Fix cacheBust issues