Fixed broken cache compilation due to incompatible stubs

Sorry for the duplicate of the previous one, I'm not too familiar with rebasing and don't want to mess anything up - I should have remembered to switch branch! Please delete the other issue. Also, sorry for the late reply, I was away from my machine. Regards, adrianlshaw.