I have to admit I'm a bit feared of the caching stuff as I tend to miss something important here.
Maybe we can do that in an own PR after this is accepted. It's certainly a good idea.