Removed mock code using mock caching