Cosmetics
Some caching cleanup