Rob Franken

Add to that that if we do token forwarding we need to make sure that we don't use the cache for someone with a different token to prevent leaking resources...

I think it would also help us if we get the state icons more nicely done (#1349) and use them here. Since IMHO It would be nice to see that...