Prepare for 0.2.7 / Caching tweaks