Minor speed-up in prepare_for_caching