Merge pluggable_cache to master

pluggable_cache has been the best branch for multiple years.  Merging in various fixes from Transfer list back to master to create best-known-version.