Made cache to work