Mended Storage api

It is not a good idea to pickle.dump a live class