Enhancement #3: fixed cache buster issue