This is more general and aligns well with the other methods.
Also allows the kubernetes middleware to use it.

Fixes #940