Use cached results and remove old code
Add more autocmds