I agree. If you're ok changing it I think we should use the stored version rather than load it from disk.