Implemented cache only / Fixes suggested by Jelle