Refactor tooltip logic into new file
Update cache revision