Merge :cacheable changes back in