@Override public Password remove(String key) { // Make it compatible with the old way (low-efficient) if (!key.contains(":")) { Password password = getByUsername((String) key); validate(); if (password == null) return null; password.remove(); // by invalidating any access to items will get refreshed invalidate(); return password; } return super.remove(key); }