Make thread safe, don't use long
Merge pull request #1558 from marcel-blonk/PLFM-currentcache

Make thread safe, don't use long