Added Store expiration with entry remove if expired