#691 - Tweak link position
#691 - Extract method to provide opportunity to override bundle cache keys