Refactoring, update cache for set restriction