caching working full fledged now