Minor improvements
Added cache gems