refactoring last-access store