Cache buster and Click macros+

Cache buster and Click macros