Fix cache race condition
Add more shorteners