Simplifying proxy storage for #302