Reacting to the cache package rename and few misc changes

1. Setting expiry time for cached items.
2. Some other misc changes.