Fix double get on cache remember.
Merge branch '4.0'