Added more logging and caching 

- Fixed issued seen when auth was not enabled