various caching changes