SAMCache 0.2.1
Merge pull request #7588 from soffes/SAMCache-v0.2.1

SAMCache 0.2.1