Make spree tests more reliable
Add cached_kind attribute to zone