Mixed implementation.  Updated caching