shorten some code paths
re-org cache a bit