Cache busting refactoring