Test updated for caching