Better cacheBust support