Call cache store callback before lookup callbacks
Merge branch '0.1' into 0.2