case 3388 - Minor fixes to fallback when loaned item is not in teh ting well. Cache it as well.
Merge branch 'case-3388' into develop