Second Commit for cache feature