More cacheing flexibility, work in progress, has exceptions