Updated Controllers and created a cached Repository