Authorisation cache and some refactorings #2