Re-applying bugfixes.
Merge pull request #1 from Vocativ/batcache-bugfixes

Re-applying bugfixes.