reenable the caching that caused bug #918, 
rolling back @abbaa5029a9752baab909b3d1b3672e2add93e62