Remove usage of __getattr__ to proxy onto storage

Change-Id: I5ef5fbb587ca263f1310d538f5e1328fe69701bb