Cache update from April...
Few more changes from early April...