Cachebust was not working correctly - fixed.
Refactored the fixupUrl function to single version of function (reduces duplication in code) and improved the unique string creation for cacheBusting.