More debugging + don't rely on Cache updates being immediately visible - #284

Signed-off-by: Ross Allan <rallanpcl@gmail.com>