Metadata proxy optimization

Agreed, working on it.