Add cache to servlet
Remove conflict