Reverted changes accidentally commited in sandbox
Added bucket cache optimization