Fixes: U4-3606 Handle caching issues from server requests correctly