Fixing issue #344.
Fixing issue #343.
Fixing issue #342.
Updating cache.