fixed storage expiration and object handling