Fixed cashe bugs (SAM unBO-ed it again)