Why not reuse findByStorageId here?