More caching fixes
Version bump