Better handling of was_cached