Updated ACL code to cache and build