better persistent storage behavior