DDF-651: Added cache expiration and tests.