Fix issue with new caching preferences always querying on user