Use the proper storage with http. Fixes #6