Fixed Cache, GA
Fixed merge