Improve cache interactions

Do not interact with the XID request cache until the request completes.

Change-Id: I39a8b0bac94474a5a52ef461ed596e70bddfd087
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>