Add TODO item to remove cache (pass them as dependency); fix web request error (when server return codes)