Simplify cache buster and use only values that can change.

fixes #4567