[3.8] Fix ACL cache issue