Update: cache control improved