Merge "Add permission caching to PermissionController" into main