Fix bug with caching switch
WIP: Less stupid auth...