Updated for new cache implementation.