removed more cacheable stuff