fix saveToCache() usage; move hook controllers around