...
Add a null check since last-access store usage is optional