removed more cacheable stuff/3