Fix storages' getter and context management